summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-12-05 14:47:57 +0100
committerLiang Qi <liang.qi@qt.io>2019-12-05 14:47:57 +0100
commit4282752c1993420d0ab1c21c5dad01679cf18365 (patch)
treecf8ae2deae7b2889070b59bfd742061fc6a50dff
parent7c1c98e123c8b255c079b299d4e84680512396ca (diff)
parente4f9ac5607a329bae045567a339d36469bc4fff6 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
-rwxr-xr-xcoin/provisioning/common/shared/testserver/docker_images.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/coin/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh
index e98183d8..1d467f7b 100755
--- a/coin/provisioning/common/shared/testserver/docker_images.sh
+++ b/coin/provisioning/common/shared/testserver/docker_images.sh
@@ -51,18 +51,20 @@ sha1tree () {
sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1
}
-# Using SHA-1 of each server context as the tag of docker images. A tag labels a
-# specific image version. It is used by docker compose file (docker-compose.yml)
-# to launch the corresponding docker containers. If one of the server contexts
-# (./apache2, ./danted, ...) gets changes, all the related compose files in
-# qtbase should be updated as well.
+# A tag labels a specific image version. In the docker compose file
+# (docker-compose.yml) that launches the containers, the tag used is
+# "latest". Here the images are also tagged with the SHA1 of each server
+# context, so if needed we can modify docker-compose.yml to launch a very
+# specific image, thus providing a way to stage backwards-incompatible changes
+# across repositories.
source "$SERVER_PATH/settings.sh"
for server in $testserver
do
context="$SERVER_PATH/$server"
- docker build -t qt-test-server-$server:$(sha1tree $context) $context
+ tag=$(sha1tree $context)
+ docker build -t qt-test-server-$server:$tag -t qt-test-server-$server:latest $context
done
docker images