Replace Docker-in-Docker setup with multi-stage build. #86
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,14 @@ | ||
| steps: | ||
| - label: ":construction_worker: Build integration test image" | ||
| command: scripts/make-integration-test-image.sh | ||
|
|
||
| - label: ":shipit: Build and push main image" | ||
| command: scripts/build-image.sh | ||
|
|
||
| - wait | ||
|
|
||
| - label: ":mag: Run integration tests" | ||
| command: scripts/run-integration-tests.sh | ||
|
|
||
| - label: ":shipit: Build minimal test image" | ||
| command: dev/build-minimal-image.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| #!/usr/bin/env bash | ||
| set -ex | ||
|
|
||
| HERE=$(dirname $0) | ||
| . $HERE/../scripts/common | ||
|
|
||
| MINIMAL_BRANCH_TAG=$ORG/montagu-reverse-proxy-minimal:$GIT_BRANCH | ||
| MINIMAL_SHA_TAG=$ORG/montagu-reverse-proxy-minimal:$GIT_SHA | ||
|
|
||
| docker build \ | ||
| -t $MINIMAL_BRANCH_TAG \ | ||
| -t $MINIMAL_SHA_TAG \ | ||
| -f dev/minimal.dockerfile \ | ||
| . | ||
|
|
||
| if [[ "$BUILDKITE" = "true" ]]; then | ||
| docker push $MINIMAL_SHA_TAG | ||
| docker push $MINIMAL_BRANCH_TAG | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| FROM node:16-buster | ||
|
|
||
| WORKDIR /workspace | ||
| COPY . /workspace | ||
|
|
||
| RUN npm install | ||
| RUN npm run test | ||
|
|
||
| FROM nginx:stable | ||
|
|
||
| COPY nginx.conf /etc/nginx/nginx.conf | ||
| COPY dev/nginx.minimal.conf /etc/nginx/conf.d/montagu.conf | ||
| COPY index.html /usr/share/nginx/html/index.html | ||
| COPY 404.html /usr/share/nginx/html/404.html | ||
| COPY resources /usr/share/nginx/html/resources | ||
|
|
||
| # Copy third party javascript from npm modules | ||
| ENV THIRDPARTY_JS_PATH /usr/share/nginx/html/resources/js/third_party/ | ||
| COPY --from=0 /workspace/node_modules/pako/dist/pako.min.js $THIRDPARTY_JS_PATH | ||
| COPY --from=0 /workspace/node_modules/vue/dist/vue.min.js $THIRDPARTY_JS_PATH | ||
| COPY --from=0 /workspace/node_modules/jwt-decode/build/jwt-decode.min.js $THIRDPARTY_JS_PATH | ||
| COPY --from=0 /workspace/node_modules/jquery/dist/jquery.min.js $THIRDPARTY_JS_PATH | ||
|
|
||
| # Copy third party css from npm modules | ||
| COPY --from=0 /workspace/node_modules/bootstrap/dist/css/bootstrap.min.css /usr/share/nginx/html/resources/css/third_party/ | ||
| COPY --from=0 /workspace/node_modules/bootstrap/dist/css/bootstrap.min.css.map /usr/share/nginx/html/resources/css/third_party/ | ||
|
|
||
| RUN rm /etc/nginx/conf.d/default.conf | ||
|
|
||
| CMD exec nginx -g "daemon off;" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ x-logging: &log-journald | |
|
|
||
| services: | ||
| api: | ||
| image: ${ORG}/montagu-api:abf39a2 | ||
|
There was a problem hiding this comment. This is currently pointed at vimc/montagu-api#479, I'll update once that PR is merged. |
||
| ports: | ||
| - "8080:8080" | ||
| networks: | ||
|
|
@@ -69,4 +69,4 @@ volumes: | |
| static_volume: | ||
| token_key_volume: | ||
| networks: | ||
| proxy: | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,38 @@ | ||
| FROM node:16-buster | ||
|
|
||
| RUN apt-get update && apt-get install -yq \ | ||
| fonts-liberation \ | ||
| libasound2 \ | ||
| libatk-bridge2.0-0 \ | ||
| libatk1.0-0 \ | ||
| libatspi2.0-0 \ | ||
| libcups2 \ | ||
| libdrm2 \ | ||
| libgbm1 \ | ||
| libgtk-3-0 \ | ||
| libnspr4 \ | ||
| libnss3 \ | ||
| libvulkan1 \ | ||
| libxcomposite1 \ | ||
| libxdamage1 \ | ||
| libxfixes3 \ | ||
| libxkbcommon0 \ | ||
| libxrandr2 \ | ||
| xdg-utils | ||
|
|
||
| # Pick the version from https://googlechromelabs.github.io/chrome-for-testing/ | ||
| ARG CHROME_VERSION="131.0.6778.85" | ||
|
|
||
| RUN wget https://storage.googleapis.com/chrome-for-testing-public/$CHROME_VERSION/linux64/chrome-linux64.zip | ||
| RUN wget https://storage.googleapis.com/chrome-for-testing-public/$CHROME_VERSION/linux64/chromedriver-linux64.zip | ||
|
|
||
| RUN unzip -d /opt chrome-linux64.zip | ||
| RUN unzip -d /opt chromedriver-linux64.zip | ||
|
|
||
| ENV PATH="/opt/chrome-linux64:/opt/chromedriver-linux64:$PATH" | ||
|
|
||
| WORKDIR /workspace | ||
| COPY . /workspace | ||
|
|
||
| RUN npm install | ||
| CMD npm run integration-test |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will it?
build-minimal-image.shreferences the.Dockerfile, which is provided in thedevfolder along with the script, but if you're running that from the project root folder, won't it use the Dockerfile at the root? Might be better to give the dev (minimal) dockerfile a more explicit name likebuildMinimal.dockerfilelike it used to have.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like I just naively copy pasted this. Renamed to
dev/minimal.dockerfile, and added the appropriate-fflag.