diff options
| author |  MarkKoz <[email protected]> | 2019-09-24 13:21:33 -0700 |
|---|---|---|
| committer | MarkKoz <[email protected]> | 2019-09-24 13:21:33 -0700 |
| commit | 4c885f732867941c7a4f9e1167f9d26a5c1faadf (patch) | |
| tree | 9336c98a5d8eae640669f4a1a960f122ca057a18 | |
| parent | Fix conditions (diff) | |
Simulate Dockerfile change
| -rw-r--r-- | docker/venv.Dockerfile | 1 | ||||
| -rwxr-xr-x | scripts/check_dockerfiles.sh | 27 |
2 files changed, 17 insertions, 11 deletions
diff --git a/docker/venv.Dockerfile b/docker/venv.Dockerfile index 859ae6d..ae61cbb 100644 --- a/docker/venv.Dockerfile +++ b/docker/venv.Dockerfile @@ -8,6 +8,7 @@ ENV PIP_NO_CACHE_DIR=false \ PIPENV_VENV_IN_PROJECT=1 COPY Pipfile Pipfile.lock /snekbox/ + WORKDIR /snekbox RUN if [ -n "${DEV}" ]; pipenv sync --dev; then pipenv sync; fi diff --git a/scripts/check_dockerfiles.sh b/scripts/check_dockerfiles.sh index c84c61f..d225267 100755 --- a/scripts/check_dockerfiles.sh +++ b/scripts/check_dockerfiles.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euo pipefail +set -euxo pipefail exec 3>&1 # New file descriptor to stdout BASE_URL="https://dev.azure.com/\ @@ -61,7 +61,11 @@ fi # Compare diffs head="$(git rev-parse HEAD)" -printf '%s\n' "Comparing HEAD (${head}) against ${prev_commit}." +printf \ + 'Comparing HEAD (%s) against %s (%s)\n' \ + "${head}" \ + "${prev_commit}" \ + "$(git rev-parse "${prev_commit}")" if git diff --quiet "${prev_commit}" -- docker/base.Dockerfile; then echo "No changes detected in docker/base.Dockerfile." @@ -74,13 +78,14 @@ fi if git diff --quiet "${prev_commit}" -- docker/venv.Dockerfile Pipfile*; then echo "No changes detected in docker/venv.Dockerfile or the Pipfiles." echo "##vso[task.setvariable variable=VENV_CHANGED;isOutput=true]False" -elif master_commit="$( - get_build "refs/heads/master" \ - | jq -re '.value[0].sourceVersion' - )" \ - && git diff --quiet "${master_commit}" -- docker/base.Dockerfile -then - # Though base image hasn't changed, it's still needed to build the venv. - echo "Can pull base image from Docker Hub; no changes made since master." - echo "##vso[task.setvariable variable=BASE_PULL;isOutput=true]True" + if master_commit="$( + get_build "refs/heads/master" \ + | jq -re '.value[0].sourceVersion' + )" \ + && git diff --quiet "${master_commit}" -- docker/base.Dockerfile + then + # Though base image hasn't changed, it's still needed to build the venv. + echo "Can pull base image from Docker Hub; no changes made master." + echo "##vso[task.setvariable variable=BASE_PULL;isOutput=true]True" + fi fi |