diff --git a/.dockerignore b/.dockerignore index f59ec20aabf5842d237244ece8c81ab184faeac1..34abd86f1d013a0ece74c70cfd94cc03c3b25743 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,24 @@ -* \ No newline at end of file +.tmp +.vscode +bin +coverage +data +dist +docs +node_modules +public +site +src +test +.dockerignore +.gitignore +.gitlab-ci.yml +.npmignore +docker-compose.yml +Dockerfile +mkdocs.yml +package-lock.json +package.json +Readme.md +tsconfig.json +webpack.* \ No newline at end of file diff --git a/.gitignore b/.gitignore index 16d16353f5adac177ce99c6a3ac87765a2f29e75..5c52516b725390e00723198b0b05a8e4c2b0360d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ /public /data /site -/coverage \ No newline at end of file +/coverage +*.tgz \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45f4a7b3d6bcc987f2b90e4d1b460e6708bc724d..4f78130dd0e8a5d65910dbb206d1b1b67b80fb0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,20 +37,20 @@ npm_ci: tags: - docker -npm_publish: +npm_pack: stage: publish_app only: - master image: node:8-alpine script: - - echo "//docker.ub.intern.uni-leipzig.de/:_authToken=${NPM_TOKEN}" > ~/.npmrc - - npm publish + - npm pack cache: key: "${CI_COMMIT_SHA}" paths: - node_modules - dist - public + - "*.tgz" tags: - docker @@ -62,10 +62,10 @@ docker_build: services: - docker:dind script: - - docker login --username '${DOCKER_USER}' --password '${DOCKER_PASSWORD}' - - docker build --no-cache --pull -t ubleipzig/dacap:latest . - - docker tag ubleipzig/dacap:latest ubleipzig/dacap:${CI_PIPELINE_ID} - - docker push ubleipzig/dacap:${CI_PIPELINE_ID} - - docker push ubleipzig/dacap:latest + - docker login --username ${DOCKER_USER} --password ${DOCKER_PASSWORD} + - docker build --no-cache --pull -t bdddev/dacap:latest . + - docker tag ubleipzig/dacap:latest bdddev/dacap:${CI_PIPELINE_ID} + - docker push bdddev/dacap:${CI_PIPELINE_ID} + - docker push bdddev/dacap:latest tags: - docker diff --git a/.npmignore b/.npmignore index ad5043630122a6ddee6dc04d4e24d8fedc7a06cd..be4b4e443aefc32ef6143778431d41ca721a04c2 100644 --- a/.npmignore +++ b/.npmignore @@ -16,4 +16,5 @@ /package-lock.json /report.xml /Dockerfile -/*.tgz \ No newline at end of file +/*.tgz +/.gitlab-ci.yml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2834d4569dcd00eca0c88fc19741853c102c0028..5020b79756478f6df49c35861c0865b380c118b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,9 @@ FROM library/node:8-alpine VOLUME ["/data"] EXPOSE 3000 ENV npm_config_registry=https://docker.ub.intern.uni-leipzig.de/npm \ - data_dir=/data -RUN npm install -g dacap + data_dir=/data \ + NODE_ENV=production \ + APP_VERSION=1.0.9 +COPY dacap-${APP_VERSION}.tgz /tmp/ +RUN npm install -g /tmp/dacap-${APP_VERSION}.tgz CMD chown node:node -R ${data_dir} && su node -c dacap \ No newline at end of file