[activemq-artemis] branch main updated: ARTEMIS-3748 support older versions in prepare-docker.sh

[jbertram]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 98d176ae83 ARTEMIS-3748 support older versions in prepare-docker.sh
     new abeed34449 This closes #4215
98d176ae83 is described below

commit 98d176ae83f0c36e429e72c41063d41c8a9e9eb7
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Wed Sep 14 14:07:14 2022 -0500

    ARTEMIS-3748 support older versions in prepare-docker.sh
---
 artemis-docker/prepare-docker.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/artemis-docker/prepare-docker.sh b/artemis-docker/prepare-docker.sh
index c6b766f078..efe12dbfc8 100755
--- a/artemis-docker/prepare-docker.sh
+++ b/artemis-docker/prepare-docker.sh
@@ -39,7 +39,7 @@ Usage:
 
 Example:
   ./prepare-docker.sh --from-local-dist --local-dist-path 
../artemis-distribution/target/apache-artemis-2.17.0-SNAPSHOT-bin/apache-artemis-2.17.0-SNAPSHOT
-  ./prepare-docker.sh --from-release --artemis-version 2.16.0  
+  ./prepare-docker.sh --from-release --artemis-version 2.16.0
 
 HERE
   exit 1
@@ -51,7 +51,7 @@ next_step () {
 Well done! Now you can continue with the Docker image build.
 Building the Docker Image:
   Go to $ARTEMIS_DIST where you prepared the binary with Docker files.
-  
+
   # Go to $ARTEMIS_DIST
   $ cd $ARTEMIS_DIST
 
@@ -67,7 +67,7 @@ Building the Docker Image:
   # For AdoptOpen JDK 11 (Build for linux ARMv7/ARM64)
   $ docker buildx build --platform linux/arm64,linux/arm/v7 --push -t 
{your-repository}/apache-artemis:2.17.0-SNAPSHOT -f 
./docker/Dockerfile-eclipse-temurin-11 .
 
-Note: -t artemis-debian, -t artemis-centos and artemis-eclipse-temurin-11 are 
just 
+Note: -t artemis-debian, -t artemis-centos and artemis-eclipse-temurin-11 are 
just
 tag names for the purpose of this guide
 
 For more info read the readme.md
@@ -123,11 +123,17 @@ if [ -n "${FROM_RELEASE}" ]; then
   [ -n "${ARTEMIS_VERSION}" ] || usage "You must specify the release version 
(es.: --artemis-version 2.16.0)"
 
   cleanup
-  
+
   ARTEMIS_BASE_URL="$(curl -s 
https://www.apache.org/dyn/closer.cgi\?preferred=true)activemq/activemq-artemis/${ARTEMIS_VERSION}/"
   ARTEMIS_DIST_FILE_NAME="apache-artemis-${ARTEMIS_VERSION}-bin.tar.gz"
   CURL_OUTPUT="${BASE_TMPDIR}/${ARTEMIS_VERSION}/${ARTEMIS_DIST_FILE_NAME}"
 
+  # Fallback to the Apache archive if the version doesn't exist on the CDN 
anymore
+  if [ -z "$(curl -Is ${ARTEMIS_BASE_URL}${ARTEMIS_DIST_FILE_NAME} | head -n 1 
| grep 200)" ]
+  then
+    
ARTEMIS_BASE_URL="https://archive.apache.org/dist/activemq/activemq-artemis/${ARTEMIS_VERSION}/";
+  fi
+
   if [ -z "$(ls -A ${BASE_TMPDIR}/${ARTEMIS_VERSION})" ]
   then
     echo "Downloading ${ARTEMIS_DIST_FILE_NAME} from ${ARTEMIS_BASE_URL}..."
@@ -141,15 +147,15 @@ if [ -n "${FROM_RELEASE}" ]; then
   fi
 
   ARTEMIS_DIST="${BASE_TMPDIR}/${ARTEMIS_VERSION}"
-  
+
   echo "Using Artemis dist: ${ARTEMIS_DIST}"
 
 elif [ -n "${FROM_LOCAL}" ]; then
-  
+
   if [ -n "${LOCAL_DIST_PATH}" ]; then
     ARTEMIS_DIST=${LOCAL_DIST_PATH}
     echo "Using Artemis dist: ${ARTEMIS_DIST}"
-  else 
+  else
      usage "You must specify the local distribution directory"
   fi