mythic-insight/legendary-doc-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Use restore-timestamps inside docker image

Browse source
This commit is contained in:
Robert Prehn 2021-04-24 11:44:45 -05:00
parent 2418bb9d5c
commit e160a73d21
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -38,7 +38,6 @@ build_image_for_commit:
services: services:
- name: docker:20.10-dind - name: docker:20.10-dind
script: script:
- script/ci/restore-timestamps
- docker login "https://${CI_REGISTRY}" -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD - docker login "https://${CI_REGISTRY}" -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CI_REGISTRY_IMAGE:latest || true - docker pull $CI_REGISTRY_IMAGE:latest || true
# This enables fast parallel builds # This enables fast parallel builds
@ -49,7 +48,6 @@ build_image_for_commit:
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
# Pull out the built _build/prod directory so we can cache it! # Pull out the built _build/prod directory so we can cache it!
- docker cp `docker create $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA`:/root/app/_build/prod _build - docker cp `docker create $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA`:/root/app/_build/prod _build
- script/ci/restore-timestamps
# If tests pass, tag the commit and update package versions # If tests pass, tag the commit and update package versions
deploy_to_tags: deploy_to_tags:

3
Dockerfile
View file

@ -28,6 +28,7 @@ ADD ./apps/content/mix.exs /root/app/apps/content/
ADD ./apps/core/mix.exs /root/app/apps/core/ ADD ./apps/core/mix.exs /root/app/apps/core/
ADD ./_build/ /root/app/_build/ ADD ./_build/ /root/app/_build/
ADD ./deps/ /root/app/deps/ ADD ./deps/ /root/app/deps/
RUN script/restore-timestamps
RUN mix deps.get RUN mix deps.get
RUN mix deps.compile RUN mix deps.compile
@ -55,4 +56,6 @@ RUN MAKE=cmake mix compile
COPY --from=1 /root/app/apps/app/priv/static/ /root/app/apps/app/priv/static COPY --from=1 /root/app/apps/app/priv/static/ /root/app/apps/app/priv/static
RUN mix phx.digest RUN mix phx.digest
RUN script/restore-timestamps
CMD ["mix", "phx.server"] CMD ["mix", "phx.server"]

4
script/cibuild
View file

@ -6,7 +6,7 @@ set -e
mix local.hex --force mix local.hex --force
mix local.rebar --force mix local.rebar --force
script/ci/restore-timestamps script/restore-timestamps
mix deps.get mix deps.get
mix ecto.create mix ecto.create
@ -14,4 +14,4 @@ mix ecto.migrate
mix test mix test
script/ci/restore-timestamps script/restore-timestamps

0
script/ci/restore-timestamps → script/restore-timestamps
View file