Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build and push p and z-linux images to Docker Hub #332

Merged
merged 4 commits into from
Feb 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
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"
- 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
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ build_manifest() {
## 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" \

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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ build_release() {
git checkout -q "${RELEASE}"
fi

docker build -t "${full_image}" .
docker build -t "${full_image}" --build-arg GO_ARCH=${arch} .
return $?
}

Expand Down
1 change: 1 addition & 0 deletions scripts/build-releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ main() {
}

build_releases() {
git fetch --tags
tags="$(git tag -l)"
while read -r tag; do
if [[ -z "${tag}" ]]; then
Expand Down
5 changes: 4 additions & 1 deletion scripts/release-blocklist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,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