From 18279f964b17c9cf7256dfe94f9a4a2341f2dfc2 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 23 Apr 2021 19:12:52 +0200 Subject: [PATCH] Fix building Docker images on master Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 2 +- docker/production/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0dfb27c..2b386e9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,7 +184,7 @@ pages: - mkdir -p /kaniko/.docker - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$CI_REGISTRY_AUTH\",\"email\":\"$CI_REGISTRY_EMAIL\"}}}" > /kaniko/.docker/config.json script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/docker/production/Dockerfile --destination $DOCKER_IMAGE_NAME --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP --build-arg CI_COMMIT_TAG=$CI_COMMIT_TAG + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/docker/production/Dockerfile --destination $DOCKER_IMAGE_NAME --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP build-docker-master: <<: *docker diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 4865986d..b6f752af 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -34,8 +34,6 @@ FROM alpine ARG BUILD_DATE ARG VCS_REF -ARG CI_COMMIT_TAG -ARG MOBILIZON_VERSION=${CI_COMMIT_TAG} LABEL org.opencontainers.image.title="mobilizon" \ org.opencontainers.image.description="Mobilizon for Docker" \ @@ -58,7 +56,7 @@ EXPOSE 4000 ENV MOBILIZON_DOCKER=true COPY --from=builder --chown=nobody:nobody _build/prod/rel/mobilizon ./ -RUN cp /releases/${MOBILIZON_VERSION}/runtime.exs /etc/mobilizon/config.exs +RUN cp /releases/*/runtime.exs /etc/mobilizon/config.exs COPY docker/production/docker-entrypoint.sh ./ ENTRYPOINT ["./docker-entrypoint.sh"]