Skip to content
This repository was archived by the owner on Sep 1, 2021. It is now read-only.

Commit e216d31

Browse files
Upgraded dependencies
1 parent 18a7473 commit e216d31

File tree

4 files changed

+309
-374
lines changed

4 files changed

+309
-374
lines changed

Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ WORKDIR /usr/src/app
66

77
# Copy in source
88
COPY tsconfig.json .snyk angular.json yarn.lock ngsw-config.json ./
9+
COPY ormconfig.prod.json ormconfig.json
910
COPY src ./src
1011

1112
# Install packages
@@ -28,11 +29,6 @@ WORKDIR /usr/src/app
2829

2930
# Bundle pre-built app
3031
COPY --from=builder /usr/src/app ./
31-
COPY ormconfig.prod.json ormconfig.json
32-
33-
# Rebuild bcrypt to avoid segfault
34-
RUN apk update ; \
35-
apk add python make g++;
3632

3733
EXPOSE 3000
38-
ENTRYPOINT npm run migrations:run && npm run start
34+
ENTRYPOINT npm run db:sync && npm run start

ormconfig.prod.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"password": "admin",
1010
"database": "gymsystem",
1111
"logging": "error",
12-
"extra": { "insecureAuth": true },
1312
"entities": [
1413
"dist/model/*.js"
1514
],

package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"client:prod": "ng serve --proxy-config proxy.conf.json",
3838
"client:build": "ng --version && ng build --prod --progress=false",
3939
"client:buildw": "yarn client:build -w",
40-
"client:test": "ng test --progress=false",
41-
"client:testw": "yarn client:test -w",
40+
"client:test": "yarn client:testw --watch=false",
41+
"client:testw": "ng test --progress=false",
4242
"pree2e": "yarn docker:run:test && wait-on tcp:3305 && yarn server:build && typeorm schema:sync -c test && typeorm migration:run -c test",
4343
"e2e": "concurrently -s first --kill-others --exitcrash -p \"[{name}]\" -n \"SERVER,CLIENT\" -c \"bgBlue.bold,bgYellow.bold\" \"yarn e2e:server\" \"yarn e2e:client\"",
4444
"e2e:server": "yarn server -- test",
@@ -71,27 +71,27 @@
7171
},
7272
"dependencies": {
7373
"@agm/core": "1.0.0-beta.2",
74-
"@angular/animations": "6.0.0",
75-
"@angular/cdk": "6.0.0",
76-
"@angular/common": "6.0.0",
77-
"@angular/compiler": "6.0.0",
78-
"@angular/core": "6.0.0",
79-
"@angular/forms": "6.0.0",
80-
"@angular/http": "6.0.0",
81-
"@angular/material": "6.0.0",
82-
"@angular/platform-browser": "6.0.0",
83-
"@angular/platform-browser-dynamic": "6.0.0",
84-
"@angular/pwa": "^0.6.0",
85-
"@angular/router": "6.0.0",
86-
"@angular/service-worker": "6.0.0",
74+
"@angular/animations": "6.0.1",
75+
"@angular/cdk": "6.0.1",
76+
"@angular/common": "6.0.1",
77+
"@angular/compiler": "6.0.1",
78+
"@angular/core": "6.0.1",
79+
"@angular/forms": "6.0.1",
80+
"@angular/http": "6.0.1",
81+
"@angular/material": "6.0.1",
82+
"@angular/platform-browser": "6.0.1",
83+
"@angular/platform-browser-dynamic": "6.0.1",
84+
"@angular/pwa": "0.6.1",
85+
"@angular/router": "6.0.1",
86+
"@angular/service-worker": "6.0.1",
8787
"@ngx-translate/core": "10.0.1",
8888
"@ngx-translate/http-loader": "3.0.1",
8989
"angulartics2": "6.0.0",
9090
"bcryptjs": "2.4.3",
9191
"body-parser": "1.18.2",
9292
"chalk": "2.4.1",
9393
"cookie-parser": "1.4.3",
94-
"core-js": "2.5.5",
94+
"core-js": "2.5.6",
9595
"cors": "2.8.4",
9696
"dragula": "3.7.2",
9797
"event-source-polyfill": "0.0.12",
@@ -103,7 +103,7 @@
103103
"hammer-timejs": "1.1.0",
104104
"hammerjs": "2.0.8",
105105
"handlebars": "4.0.11",
106-
"husky": "1.0.0-rc.1",
106+
"husky": "1.0.0-rc.4",
107107
"json2csv": "4.1.2",
108108
"lodash": "4.17.10",
109109
"markdown-to-html-pipe": "1.2.4",
@@ -123,20 +123,20 @@
123123
"rimraf": "2.6.2",
124124
"routing-controllers": "0.7.7",
125125
"rxjs": "6.1.0",
126-
"rxjs-compat": "^6.1.0",
126+
"rxjs-compat": "6.1.0",
127127
"sendmail": "1.4.1",
128128
"serve-favicon": "2.5.0",
129129
"session-memory-store": "0.2.2",
130-
"typedi": "0.7.2",
130+
"typedi": "0.7.3",
131131
"typeorm": "0.2.5",
132132
"winston": "2.4.2",
133133
"zone.js": "0.8.26"
134134
},
135135
"devDependencies": {
136-
"@angular-devkit/build-angular": "0.6.0",
137-
"@angular/cli": "6.0.0",
138-
"@angular/compiler-cli": "6.0.0",
139-
"@angular/language-service": "^6.0.0",
136+
"@angular-devkit/build-angular": "0.6.1",
137+
"@angular/cli": "6.0.1",
138+
"@angular/compiler-cli": "6.0.1",
139+
"@angular/language-service": "6.0.1",
140140
"@biesbjerg/ngx-translate-extract": "2.3.4",
141141
"@types/bcryptjs": "2.4.1",
142142
"@types/body-parser": "1.17.0",
@@ -152,7 +152,7 @@
152152
"@types/mkdirp": "0.5.2",
153153
"@types/morgan": "1.7.35",
154154
"@types/multer": "1.3.6",
155-
"@types/node": "10.0.3",
155+
"@types/node": "10.0.7",
156156
"@types/node-schedule": "1.2.2",
157157
"@types/passport": "0.4.5",
158158
"@types/passport-local": "1.0.33",
@@ -172,9 +172,9 @@
172172
"karma-jasmine": "1.1.2",
173173
"karma-jasmine-html-reporter": "1.0.0",
174174
"karma-spec-reporter": "0.0.32",
175-
"nodemon": "1.17.3",
176-
"protractor": "5.3.1",
177-
"snyk": "1.78.1",
175+
"nodemon": "1.17.4",
176+
"protractor": "5.3.2",
177+
"snyk": "1.80.0",
178178
"ts-node": "6.0.3",
179179
"tslint": "5.10.0",
180180
"typescript": ">=2.7.0 <2.8.0",

0 commit comments

Comments
 (0)