Better image building

Description

Updates the current slim image generation dockerfile and script to allow for automatic worker name generation and custom version suffixes ("tags")

Changes

• The name now is a separate environment variable WORKERNAME instead of the hostname
• The all component for the build script is a synonym for no argument at all

Additions

• A second (optional) parameter that is part of the version suffix. An example: ./build-slim-image all experimental-metrics This builds and pushes both f00f/auta-core:1.2.0-experimental-metrics and f00f/auta-worker:1.2.0-experimental-metrics

Test and Review

To be filled in by the reviewers

• There are no unnecessary files present in the MR

• The continuous integration has no problems with the MR

• The MR is filled in as requested (including labels, milestones, and reviewers)

• The documentation is up-to-date

build-slim-image

@@ -2,17 +2,23 @@
 set -e
 
 COMPONENT=$1
+TAG=$2
 
-if [ -z $COMPONENT ]
+if [ -z "$COMPONENT" -o "$COMPONENT" = all ]
 then
-  ./$0 core
-  ./$0 worker
+  ./$0 core $TAG
+  ./$0 worker $TAG
   exit
 fi
 
+if [ -n "$TAG" ]
+then
+  TAG=-$TAG
+fi
+
 VERSION=$(grep -o "    version = '[^']*'" build.gradle | cut -d "'" -f 2 | tr -d '\n')
 
-/bin/echo -e "\033[33;1mDeploying AuTA $COMPONENT v$VERSION\033[0m"
+/bin/echo -e "\033[33;1mDeploying AuTA $COMPONENT v$VERSION$TAG\033[0m"
 
 if [ $COMPONENT = core ]
 then
@@ -20,11 +26,11 @@ then
   ARGS=
 else
   ./gradlew :worker:jar
-  ARGS='host=$COREADDRESS name=$HOSTNAME api-token=$APIKEY api-protocol=$APIPROTOCOL api-port=$APIPORT'
+  ARGS='host=$COREADDRESS name=$WORKERNAME api-token=$APIKEY api-protocol=$APIPROTOCOL api-port=$APIPORT'
 fi
 
 
-docker build -t f00f/auta-$COMPONENT:$VERSION -f slim.Dockerfile . \
+docker build -t f00f/auta-$COMPONENT:$VERSION$TAG -f slim.Dockerfile . \
     --build-arg VERSION=$VERSION --build-arg COMPONENT=$COMPONENT --build-arg ARGS="$ARGS"
 
-docker push f00f/auta-$COMPONENT:$VERSION
+docker push f00f/auta-$COMPONENT:$VERSION$TAG

[Erik Oudsen]

Just checking that this is short hand for final or finish or something, not just if written backwards.

[Luc Everse]

That's the really weird way you close control blocks in the Bourne Shell