Skip to content

Commit

Permalink
Build and push p and z-linux images to Docker Hub
Browse files Browse the repository at this point in the history
  • Loading branch information
halim-lee committed Jan 28, 2022
1 parent 001fa0f commit bc3163f
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 17 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stages:
- name: rebuild-e2e-test
if: branch = main AND fork = false AND type = cron
- name: rebuild-releases
if: branch = main AND fork = false AND type = cron
if: (branch = main OR tag =~ ^v) AND fork = false AND type != cron
- name: rebuild-bundles
if: branch = main AND fork = false AND type = cron

Expand Down Expand Up @@ -76,16 +76,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" && make build-manifest RELEASE_TARGET="releases"
- name: Build releases on s390x
stage: rebuild-releases
os: linux
arch: s390x
script: make build-releases RELEASE_TARGET="releases" && make build-manifest RELEASE_TARGET="releases"
- name: Build releases on amd64
stage: rebuild-releases
os: linux
Expand Down
22 changes: 17 additions & 5 deletions scripts/build-manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,26 @@ build_manifest() {
local tag="$1"
echo "****** Building manifest for: ${tag}"

## Define current arch variable
case "$(uname -p)" in
"ppc64le")
readonly arch="ppc64le"
;;
"s390x")
readonly arch="s390x"
;;
*)
readonly arch="amd64"
;;
esac

## try to build manifest but allow failure
## this allows new release builds
local target="${IMAGE}:${tag}"
# TODO: Add back in linux/s390x and linux/ppc64le once build platforms are back up
# --platforms "linux/amd64,linux/s390x,linux/ppc64le" \
local target="${IMAGE}:${tag}-${arch}"

manifest-tool push from-args \
--platforms "linux/amd64" \
--template "${target}-ARCH" \
--platforms "linux/${arch}" \
--template "${target}" \
--target "${target}" \
|| echo "*** WARN: Target architectures not available"
}
Expand Down
4 changes: 3 additions & 1 deletion scripts/release-blocklist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ v0.5.1
v0.6.0
v0.7.0
v0.7.1

v0.8.0
v0.8.0-20211124-1750
v0.8.0-rc.1

0 comments on commit bc3163f

Please sign in to comment.