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

fix: Make node_modules available to docker build step

Browse source
This commit is contained in:
Robert Prehn 2021-03-26 00:44:05 -05:00
parent 4425a341a5
commit 230621de51
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -50,6 +50,11 @@ fetch_asset_dependencies:
- apps/app/assets/node_modules/ - apps/app/assets/node_modules/
script: script:
- cd apps/app/assets/ && npm install - cd apps/app/assets/ && npm install
artifacts:
paths:
- apps/app/assets/node_modules
exclude:
- apps/app/assets/node_modules
test: test:
stage: test stage: test
@ -80,7 +85,7 @@ build_image_for_commit:
script: script:
- 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
# - export DOCKER_BUILDKIT=1 - export DOCKER_BUILDKIT=1
- docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --build-arg BUILDKIT_INLINE_CACHE=1 . - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --build-arg BUILDKIT_INLINE_CACHE=1 .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA

1
Dockerfile
View file

@ -26,7 +26,6 @@ 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 ./deps /root/app/deps ADD ./deps /root/app/deps
RUN mix deps.get RUN mix deps.get
RUN mix deps.compile
ADD ./script /root/app/script ADD ./script /root/app/script
ADD ./apps /root/app/apps ADD ./apps /root/app/apps