From fe84a84cf8ddf119ba0f87d72a36f5fb422089b8 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 17 Aug 2020 17:45:41 +1000 Subject: [PATCH 1/3] add all supported image versions to .travis.yml Signed-off-by: Lachlan Roberts --- .travis.yml | 26 +++++++++++++++++++++++--- update.sh | 2 +- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78dc3427..23c10842 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,30 @@ language: bash dist: trusty env: + - VERSION=10.0-jdk11 + - VERSION=10.0-jdk11-slim + - VERSION=10.0-jdk14 + - VERSION=10.0-jdk14-slim + - VERSION=10.0-jre11 + - VERSION=10.0-jre11-slim + - VERSION=11.0-jdk11 + - VERSION=11.0-jdk11-slim + - VERSION=11.0-jdk14 + - VERSION=11.0-jdk14-slim + - VERSION=11.0-jre11 + - VERSION=11.0-jre11-slim - VERSION=9.2-jre8 - VERSION=9.3-jre8 - - VERSION=9.4-jre8 + - VERSION=9.4-jdk11 + - VERSION=9.4-jdk11-slim + - VERSION=9.4-jdk14 + - VERSION=9.4-jdk14-slim + - VERSION=9.4-jdk8 + - VERSION=9.4-jdk8-slim - VERSION=9.4-jre11 + - VERSION=9.4-jre11-slim + - VERSION=9.4-jre8 + - VERSION=9.4-jre8-slim install: - git clone https://github.com/docker-library/official-images.git ~/official-images @@ -15,8 +35,8 @@ install: before_script: - env | sort - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash - - cd "${VERSION}${VARIANT:+/$VARIANT}" - - image="jetty:${VERSION}${VARIANT:+-$VARIANT}" + - cd "${VERSION}" + - image="jetty:${VERSION}" script: - docker build --pull -t "$image" . diff --git a/update.sh b/update.sh index 411b586f..d9e11f5c 100755 --- a/update.sh +++ b/update.sh @@ -21,7 +21,7 @@ if [ ${#paths[@]} -eq 0 ]; then paths=( */ ) fi paths=( "${paths[@]%/}" ) -paths=($(echo "${paths[@]}" | sed 's/ /\n/g' | grep -v '^[^0-9]')) +paths=($(echo "${paths[@]}" | grep '^[0-9]')) MAVEN_METADATA_URL='https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/maven-metadata.xml' available=( $( curl -sSL "$MAVEN_METADATA_URL" | grep -Eo '<(version)>[^<]*' | awk -F'[<>]' '{ print $3 }' | sort -Vr ) ) From 84f0e18fb45228f5c45b9fcb497865cd8888d525 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 18 Aug 2020 09:15:17 +1000 Subject: [PATCH 2/3] generate .travis.yml in update.sh to get updated list of build dirs Signed-off-by: Lachlan Roberts --- .travis.yml | 44 ++++++++++++++++++++++---------------------- generateTravis.sh | 27 +++++++++++++++++++++++++++ update.sh | 11 +++++++++-- 3 files changed, 58 insertions(+), 24 deletions(-) create mode 100755 generateTravis.sh diff --git a/.travis.yml b/.travis.yml index 23c10842..9764ffc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,30 +4,30 @@ language: bash dist: trusty env: - - VERSION=10.0-jdk11 - - VERSION=10.0-jdk11-slim - - VERSION=10.0-jdk14 - - VERSION=10.0-jdk14-slim - - VERSION=10.0-jre11 - - VERSION=10.0-jre11-slim - - VERSION=11.0-jdk11 - - VERSION=11.0-jdk11-slim - - VERSION=11.0-jdk14 - - VERSION=11.0-jdk14-slim - - VERSION=11.0-jre11 - VERSION=11.0-jre11-slim - - VERSION=9.2-jre8 - - VERSION=9.3-jre8 - - VERSION=9.4-jdk11 - - VERSION=9.4-jdk11-slim - - VERSION=9.4-jdk14 - - VERSION=9.4-jdk14-slim - - VERSION=9.4-jdk8 - - VERSION=9.4-jdk8-slim - - VERSION=9.4-jre11 - - VERSION=9.4-jre11-slim - - VERSION=9.4-jre8 + - VERSION=11.0-jre11 + - VERSION=11.0-jdk14-slim + - VERSION=11.0-jdk14 + - VERSION=11.0-jdk11-slim + - VERSION=11.0-jdk11 + - VERSION=10.0-jre11-slim + - VERSION=10.0-jre11 + - VERSION=10.0-jdk14-slim + - VERSION=10.0-jdk14 + - VERSION=10.0-jdk11-slim + - VERSION=10.0-jdk11 - VERSION=9.4-jre8-slim + - VERSION=9.4-jre8 + - VERSION=9.4-jre11-slim + - VERSION=9.4-jre11 + - VERSION=9.4-jdk8-slim + - VERSION=9.4-jdk8 + - VERSION=9.4-jdk14-slim + - VERSION=9.4-jdk14 + - VERSION=9.4-jdk11-slim + - VERSION=9.4-jdk11 + - VERSION=9.3-jre8 + - VERSION=9.2-jre8 install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/generateTravis.sh b/generateTravis.sh new file mode 100755 index 00000000..c09d4536 --- /dev/null +++ b/generateTravis.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# Generate Travis CI Build Directories +buildDirs=( $(ls | egrep '^[0-9]' | sort -nr) ) + +cat <<-EOH +--- +language: bash + +dist: trusty + +env: +`printf ' - VERSION=%s\n' "${buildDirs[@]}"` + +install: + - git clone https://github.com/docker-library/official-images.git ~/official-images + +before_script: + - env | sort + - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash + - cd "\${VERSION}" + - image="jetty:\${VERSION}" + +script: + - docker build --pull -t "\$image" . + - ~/official-images/test/run.sh "\$image" +EOH \ No newline at end of file diff --git a/update.sh b/update.sh index d9e11f5c..a7994785 100755 --- a/update.sh +++ b/update.sh @@ -16,12 +16,19 @@ greaterThanOrEqualTo9.4 () fi } +# Update the Travis CI Build Directories +if ! command -v ./generateTravis.sh >/dev/null 2>&1 ; then + echo "WARNING: Run update script from the jetty.docker project directory to update the Travis CI file." +else + ./generateTravis.sh > .travis.yml +fi + +# Update the docker files and scripts for every directory in paths. paths=( "$@" ) if [ ${#paths[@]} -eq 0 ]; then - paths=( */ ) + paths=( $(ls | egrep '^[0-9]' | sort -nr) ) fi paths=( "${paths[@]%/}" ) -paths=($(echo "${paths[@]}" | grep '^[0-9]')) MAVEN_METADATA_URL='https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/maven-metadata.xml' available=( $( curl -sSL "$MAVEN_METADATA_URL" | grep -Eo '<(version)>[^<]*' | awk -F'[<>]' '{ print $3 }' | sort -Vr ) ) From efeaaee7a74183d4a04af06988bb696cdc839cde Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 18 Aug 2020 18:13:44 +1000 Subject: [PATCH 3/3] formatting fix, add newline Signed-off-by: Lachlan Roberts --- generateTravis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generateTravis.sh b/generateTravis.sh index c09d4536..d23fb68a 100755 --- a/generateTravis.sh +++ b/generateTravis.sh @@ -24,4 +24,4 @@ before_script: script: - docker build --pull -t "\$image" . - ~/official-images/test/run.sh "\$image" -EOH \ No newline at end of file +EOH