diff options
| author |   liamfallon <liam.fallon@est.tech> | 2022-07-29 13:35:49 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2022-07-29 15:33:02 +0100 |
| commit | 2da18f6d0be535eb2ae0afc74b945a39ccd8d7a8 (patch) | |
| tree | 35fff1d535af2f1927e53dd797d0e1abe240e219 /integration/src/main/scripts/release/bumpSnapshots.sh | |
| parent | 98fa7107c5d81bf2ec9623a77f4ba2ce1358e525 (diff) | |
Update docker files base images to snapshots
Currently the policy base images used in docker files in master are hard
revisions of the policy base images. The docker files should use
snapshot policy base images when they are availabe and only change to
released base images at release time.
This commit ensures that the references are updated correctly in Docker
files to snapshots or released base policy images as appropriate
Issue-ID: POLICY-4287
Change-Id: I2c68e1bad6bde2e116c27678c88f8b40dc914b0f
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'integration/src/main/scripts/release/bumpSnapshots.sh')
| -rwxr-xr-x | integration/src/main/scripts/release/bumpSnapshots.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/integration/src/main/scripts/release/bumpSnapshots.sh b/integration/src/main/scripts/release/bumpSnapshots.sh index c67e81ff..73eccd9e 100755 --- a/integration/src/main/scripts/release/bumpSnapshots.sh +++ b/integration/src/main/scripts/release/bumpSnapshots.sh @@ -178,9 +178,14 @@ do mv "$temp_file" "$repo_location/$repo/version.properties" fi - updateRefs.sh -pcmoxs -d "$release_data_file" -l "$repo_location" -r "$repo" - - if [ "$(git -C "$repo_location/$specified_repo" status | grep '^[ \t]*modified:[ \t]*pom.xml' > /dev/null 2>&1)" = 0 ] + updateRefs.sh -pcmokxs -d "$release_data_file" -l "$repo_location" -r "$repo" + + if [ "$(git -C "$repo_location/$specified_repo" status | + grep \ + -e '^\s*modified:\s*pom.xml$' \ + -e '^\s*modified:\s*.*Dockerfile$' \ + > /dev/null 2>&1)" \ + = 1 ] then references_updated=0 else |