diff --git a/Dockerfile b/Dockerfile index f2725f5e..692141c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,13 @@ FROM node:12-alpine as BUILD WORKDIR /usr/src/app COPY package*.json ./ COPY tsconfig.json ./ +COPY .env ./ +RUN cat ./.env | grep NPM_TOKEN | cut -d '=' -f 2- > /tmp/NPM_TOKEN && \ + export NPM_TOKEN=$(cat /tmp/NPM_TOKEN) && \ + rm /tmp/NPM_TOKEN +RUN echo @yesodot:registry=https://gitlab.com/api/v4/projects/29372887/packages/npm/>> .npmrc +RUN echo //gitlab.com/api/v4/projects/29372887/packages/npm/:_authToken=$(echo $NPM_TOKEN) >> .npmrc +RUN cat .npmrc RUN npm install COPY . . RUN npm run build:prod diff --git a/package.json b/package.json index 9299d61a..756208e9 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "ngx-avatar": "^3.7.0", "ngx-matomo": "^0.1.4", "passport": "^0.4.1", - "passport-shraga": "^1.4.0", + "@yesodot/passport-shraga": "^1.5.2", "rxjs": "~6.5.4", "tsc": "^1.20150623.0", "tslib": "^1.10.0", @@ -64,6 +64,6 @@ "protractor": "~5.4.3", "ts-node": "~8.3.0", "tslint": "~5.18.0", - "typescript": "^3.7.5" + "typescript": "~3.7.5" } } diff --git a/scripts/setenv.js b/scripts/setenv.js index a8d26ff3..a705e22b 100644 --- a/scripts/setenv.js +++ b/scripts/setenv.js @@ -26,4 +26,4 @@ writeFile(targetPath, environmentFileContent, function (err) { console.log(err); } console.log(`Wrote variables to ${targetPath}`); -}}; +}); diff --git a/src/passport.ts b/src/passport.ts index 99c62a1b..804a419a 100644 --- a/src/passport.ts +++ b/src/passport.ts @@ -1,7 +1,7 @@ const passport = require('passport'); const { Strategy -} = require('passport-shraga'); +} = require('@yesodot/passport-shraga'); const users = [];