Build and push p and z-linux images to Docker Hub (#323)

* Build and push p and z-linux images to Docker Hub * p and z daily image build
OpenLiberty · Mar 16, 2022 · 37f3a47 · 37f3a47
1 parent 9ef4e37
commit 37f3a47
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -42,16 +42,16 @@ jobs:
       os: linux
       arch: amd64
       script: travis_wait 45 make setup test-e2e || travis_terminate 1
-    # - name: Build image on ppc64le
-    #   stage: build
-    #   os: linux
-    #   arch: ppc64le
-    #   script: make build-releases && make build-manifest
-    # - name: Build image on s390x
-    #   stage: build
-    #   os: linux
-    #   arch: s390x
-    #   script: make build-releases && make build-manifest
+    - name: Build image on ppc64le
+      stage: build
+      os: linux
+      arch: ppc64le
+      script: make build-releases
+    - name: Build image on s390x
+      stage: build
+      os: linux
+      arch: s390x
+      script: make build-releases
     - name: Build image and bundle on amd64
       stage: build
       os: linux
@@ -77,16 +77,16 @@ jobs:
       os: linux
       arch: amd64
       script: travis_wait 45 make setup test-e2e RELEASE_TARGET="releases" || travis_terminate 1
-    # - name: Build releases on ppc64le
-    #   stage: rebuild-releases
-    #   os: linux
-    #   arch: ppc64le
-    #   script: make build-releases RELEASE_TARGET="releases"
-    # - name: Build releases on s390x
-    #   stage: rebuild-releases
-    #   os: linux
-    #   arch: s390x
-    #   script: make build-releases RELEASE_TARGET="releases"
+    - name: Build releases on ppc64le
+      stage: rebuild-releases
+      os: linux
+      arch: ppc64le
+      script: make build-releases RELEASE_TARGET="releases"
+    - name: Build releases on s390x
+      stage: rebuild-releases
+      os: linux
+      arch: s390x
+      script: make build-releases RELEASE_TARGET="releases"
     - name: Build releases on amd64
       stage: rebuild-releases
       os: linux

diff --git a/scripts/build-manifest.sh b/scripts/build-manifest.sh
@@ -62,14 +62,15 @@ build_manifest() {
   # TODO: Add back in linux/s390x and linux/ppc64le once build platforms are back up
   # --platforms "linux/amd64,linux/s390x,linux/ppc64le" \
   manifest-tool push from-args \
-    --platforms "linux/amd64" \
+    --platforms "linux/amd64,linux/s390x,linux/ppc64le" \
     --template "${target}-ARCH" \
     --target "${target}" \
     || echo "*** WARN: Target architectures not available"
 }
 
 # Build manifest for previous releases
 build_manifests() {
+  git fetch --tags
   tags="$(git tag -l)"
   while read -r tag; do
     if [[ -z "${tag}" ]]; then

diff --git a/scripts/build-release.sh b/scripts/build-release.sh
@@ -79,7 +79,7 @@ build_release() {
     git checkout -q "${RELEASE}"
   fi
 
-  docker build -t "${full_image}" .
+  docker build -t "${full_image}" --build-arg GO_ARCH=${arch} .
   return $?
 }
 

diff --git a/scripts/build-releases.sh b/scripts/build-releases.sh
@@ -47,6 +47,7 @@ main() {
 }
 
 build_releases() {
+  git fetch --tags
   tags="$(git tag -l)"
   while read -r tag; do
     if [[ -z "${tag}" ]]; then

diff --git a/scripts/release-blocklist.txt b/scripts/release-blocklist.txt
@@ -6,3 +6,7 @@ v0.5.1
 v0.6.0
 v0.7.0
 v0.7.1
+v0.8.0
+v0.8.0-20211124-0830
+v0.8.0-20211124-1750
+v0.8.0-rc.1