Fix building Docker images on master
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
c023ba63fe
commit
18279f964b
|
@ -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
|
||||
|
|
|
@ -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"]
|
||||
|
|
Loading…
Reference in a new issue