Generalize Dockerfile, add 8.1.1

tigase · Mar 11, 2021 · 22179ea · 22179ea
1 parent 6486345
commit 22179ea
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 328 deletions.
diff --git a/8.0.0/Dockerfile b/8.0.0/Dockerfile
diff --git a/8.1.0/scripts/start.sh b/8.1.0/scripts/start.sh
diff --git a/8.1.0/scripts/tigase.sh b/8.1.0/scripts/tigase.sh
diff --git a/8.1.0/Dockerfile → 8/Dockerfile b/8.1.0/Dockerfile → 8/Dockerfile
diff --git a/8.0.0/jre-8/Dockerfile → 8/jre-8/Dockerfile b/8.0.0/jre-8/Dockerfile → 8/jre-8/Dockerfile
diff --git a/8.0.0/scripts/start.sh → 8/scripts/start.sh b/8.0.0/scripts/start.sh → 8/scripts/start.sh
diff --git a/8.0.0/scripts/tigase.sh → 8/scripts/tigase.sh b/8.0.0/scripts/tigase.sh → 8/scripts/tigase.sh
diff --git a/build-all.sh b/build-all.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 
-LATEST="8.1.0"
+TIGASE_DOCKER_IMAGE="${TIGASE_DOCKER_IMAGE:-tigase/tigase-xmpp-server}"
+LATEST="8.1.1"
 
-for version in nightly 8.0.0 8.1.0 ; do
+for release in 8.1.1-b10861-dist-max 8.1.0-b10857-dist-max 8.0.0-b10083-dist-max; do
+  version=$(echo $release | cut -d'-' -f1)
+  major=$(echo $version | cut -d'.' -f1)
   echo "Building: ${version}"
-#  docker build -t tigase/tigase-xmpp-server:${version} -f ${version}/Dockerfile --no-cache ${version}/
-#  docker push tigase/tigase-xmpp-server:${version}
+  docker build -t ${TIGASE_DOCKER_IMAGE}:${version} -f ./${major}/Dockerfile --build-arg TIGASE_VERSION=${version} --build-arg TIGASE_RELEASE=${release} --no-cache  ./${major}
+  docker push ${TIGASE_DOCKER_IMAGE}:${version}
   if [[ "${LATEST}" == "${version}" ]] ; then
     echo "Pushing ${version} as latest"
-    docker tag tigase/tigase-xmpp-server:${version} tigase/tigase-xmpp-server:latest
-    docker push tigase/tigase-xmpp-server:latest
+    docker tag ${TIGASE_DOCKER_IMAGE}:${version} ${TIGASE_DOCKER_IMAGE}:latest
+    docker push ${TIGASE_DOCKER_IMAGE}:latest
   fi
-done
+done