refactor: adjust docker image creation

This commit is contained in:
Karl-Philipp Wulfert
2019-07-05 16:05:23 +02:00
parent 92c9604f8d
commit c34b736edd
2 changed files with 13 additions and 4 deletions

View File

@@ -31,9 +31,8 @@ docker-builder:
services: services:
- docker:dind - docker:dind
script: script:
- cd images/builder
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
- docker build -t registry.gitlab.com/openstapps/projectmanagement/builder . - docker build -t registry.gitlab.com/openstapps/projectmanagement/builder -f images/builder/Dockerfile .
- docker push registry.gitlab.com/openstapps/projectmanagement/builder - docker push registry.gitlab.com/openstapps/projectmanagement/builder
tags: tags:
- docker - docker
@@ -49,9 +48,8 @@ docker-node:
services: services:
- docker:dind - docker:dind
script: script:
- cd images/node
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com/openstapps/projectmanagement/ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com/openstapps/projectmanagement/
- docker build -t registry.gitlab.com/openstapps/projectmanagement/node . - docker build -t registry.gitlab.com/openstapps/projectmanagement/node -f images/node/Dockerfile .
- docker push registry.gitlab.com/openstapps/projectmanagement/node - docker push registry.gitlab.com/openstapps/projectmanagement/node
tags: tags:
- docker - docker

View File

@@ -1,3 +1,14 @@
FROM docker:stable FROM docker:stable
RUN apk update && apk add nodejs npm git
ADD . /opt/openstapps/projectmanagement
WORKDIR /opt/openstapps/projectmanagement
RUN npm ci && \
npm run build && \
chmod +x /opt/openstapps/projectmanagement/lib/cli.js && \
ln -s /opt/openstapps/projectmanagement/lib/cli.js /usr/bin/openstapps-projectmanagement
CMD [] CMD []