fix #793, ppc64le is back

fortio · Jul 12, 2023 · 41fcf43 · 41fcf43
1 parent 157dfd3
commit 41fcf43
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ defaultEnv:
   &defaultEnv
   docker:
     # specify the version
-    - image: docker.io/fortio/fortio.build:v60@sha256:18c2427ade8e8867ec8e89a65702af479dd39fde15cee6899d08e387231fc090
+    - image: docker.io/fortio/fortio.build:v61@sha256:98038f5f81bdc65fcc1a99abcba1ff6a2e22f60d627d26ad75ad8d952888e8f7
   working_directory: /build/fortio
 
 jobs:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,8 +54,7 @@ jobs:
         uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # pin@v3
         with:
           context: .
-          # platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
-          platforms: linux/amd64,linux/arm64,linux/s390x
+          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
           push: true
           tags: fortio/fortio:${{ env.VERSION }}, fortio/fortio:latest
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the binaries in larger image
-FROM docker.io/fortio/fortio.build:v60@sha256:18c2427ade8e8867ec8e89a65702af479dd39fde15cee6899d08e387231fc090 as build
+FROM docker.io/fortio/fortio.build:v61@sha256:98038f5f81bdc65fcc1a99abcba1ff6a2e22f60d627d26ad75ad8d952888e8f7 as build
 WORKDIR /build
 COPY --chown=build:build . fortio
 ARG MODE=install

diff --git a/Dockerfile.echosrv b/Dockerfile.echosrv
@@ -1,5 +1,5 @@
 # Build the binaries in larger image
-FROM docker.io/fortio/fortio.build:v60@sha256:18c2427ade8e8867ec8e89a65702af479dd39fde15cee6899d08e387231fc090 as build
+FROM docker.io/fortio/fortio.build:v61@sha256:98038f5f81bdc65fcc1a99abcba1ff6a2e22f60d627d26ad75ad8d952888e8f7 as build
 WORKDIR /build
 COPY . fortio
 RUN make -C fortio official-build-version BUILD_DIR=/build OFFICIAL_TARGET=fortio.org/fortio/echosrv

diff --git a/Dockerfile.fcurl b/Dockerfile.fcurl
@@ -1,5 +1,5 @@
 # Build the binaries in larger image
-FROM docker.io/fortio/fortio.build:v60@sha256:18c2427ade8e8867ec8e89a65702af479dd39fde15cee6899d08e387231fc090 as build
+FROM docker.io/fortio/fortio.build:v61@sha256:98038f5f81bdc65fcc1a99abcba1ff6a2e22f60d627d26ad75ad8d952888e8f7 as build
 WORKDIR /build
 COPY . fortio
 RUN make -C fortio official-build-version BUILD_DIR=/build OFFICIAL_TARGET=fortio.org/fortio/fcurl

diff --git a/Makefile b/Makefile
@@ -7,12 +7,8 @@
 IMAGES=echosrv fcurl # plus the combo image / Dockerfile without ext.
 
 DOCKER_PREFIX := docker.io/fortio/fortio
-BUILD_IMAGE_TAG := v60@sha256:18c2427ade8e8867ec8e89a65702af479dd39fde15cee6899d08e387231fc090
-# We can add back linux/ppc64le once we stop getting weird
-# Failed to fetch https://download.docker.com/linux/debian/dists/bullseye/stable/binary-ppc64el/Packages.bz2 File has unexpected size (22003 != 22785)
-# errors
-# BUILDX_PLATFORMS := linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
-BUILDX_PLATFORMS := linux/amd64,linux/arm64,linux/s390x
+BUILD_IMAGE_TAG := v61@sha256:98038f5f81bdc65fcc1a99abcba1ff6a2e22f60d627d26ad75ad8d952888e8f7
+BUILDX_PLATFORMS := linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
 BUILDX_POSTFIX :=
 ifeq '$(shell echo $(BUILDX_PLATFORMS) | awk -F "," "{print NF-1}")' '0'
 	BUILDX_POSTFIX = --load

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<!-- 1.57.2 -->
+<!-- 1.57.3 -->
 # Fortio
 
 [![Awesome Go](https://fortio.org/mentioned-badge.svg)](https://github.com/avelino/awesome-go#networking)
@@ -60,13 +60,13 @@ You can install from source:
 The [releases](https://github.com/fortio/fortio/releases) page has binaries for many OS/architecture combinations (see assets):
 
 ```shell
-curl -L https://github.com/fortio/fortio/releases/download/v1.57.2/fortio-linux_amd64-1.57.2.tgz \
+curl -L https://github.com/fortio/fortio/releases/download/v1.57.3/fortio-linux_amd64-1.57.3.tgz \
  | sudo tar -C / -xvzpf -
 # or the debian package
-wget https://github.com/fortio/fortio/releases/download/v1.57.2/fortio_1.57.2_amd64.deb
-dpkg -i fortio_1.57.2_amd64.deb
+wget https://github.com/fortio/fortio/releases/download/v1.57.3/fortio_1.57.3_amd64.deb
+dpkg -i fortio_1.57.3_amd64.deb
 # or the rpm
-rpm -i https://github.com/fortio/fortio/releases/download/v1.57.2/fortio-1.57.2-1.x86_64.rpm
+rpm -i https://github.com/fortio/fortio/releases/download/v1.57.3/fortio-1.57.3-1.x86_64.rpm
 # and more, see assets in release page
 ```
 
@@ -76,7 +76,7 @@ On a MacOS you can also install Fortio using [Homebrew](https://brew.sh/):
 brew install fortio
 ```
 
-On Windows, download https://github.com/fortio/fortio/releases/download/v1.57.2/fortio_win_1.57.2.zip and extract `fortio.exe` to any location, then using the Windows Command Prompt:
+On Windows, download https://github.com/fortio/fortio/releases/download/v1.57.3/fortio_win_1.57.3.zip and extract `fortio.exe` to any location, then using the Windows Command Prompt:
 ```
 fortio.exe server
 ```
@@ -128,7 +128,7 @@ Full list of command line flags (`fortio help`):
 <!-- use release/updateFlags.sh to update this section -->
 <pre>
 <!-- USAGE_START -->
-Φορτίο 1.57.2 usage:
+Φορτίο 1.57.3 usage:
         fortio command [flags] target
 where command is one of: load (load testing), server (starts ui, rest api,
  http-echo, redirect, proxies, tcp-echo, udp-echo and grpc ping servers),

diff --git a/Webtest.sh b/Webtest.sh
@@ -140,7 +140,7 @@ fi
 PPROF_URL="$BASE_URL/debug/pprof/heap?debug=1"
 $CURL "$PPROF_URL" | grep -i TotalAlloc # should find this in memory profile
 # creating dummy container to hold a volume for test certs due to remote docker bind mount limitation.
-DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name $DOCKERSECVOLNAME docker.io/fortio/fortio.build:v60@sha256:18c2427ade8e8867ec8e89a65702af479dd39fde15cee6899d08e387231fc090 sleep 120)
+DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name $DOCKERSECVOLNAME docker.io/fortio/fortio.build:v61@sha256:98038f5f81bdc65fcc1a99abcba1ff6a2e22f60d627d26ad75ad8d952888e8f7 sleep 120)
 # while we have something with actual curl binary do
 # Test for h2c upgrade (#562)
 docker exec $DOCKERSECVOLNAME /usr/bin/curl -v --http2 -m 10 -d foo42 http://localhost:8080/debug | tee >(cat 1>&2) | grep foo42

diff --git a/release/Dockerfile.in b/release/Dockerfile.in
@@ -1,5 +1,5 @@
 # Concatenated after ../Dockerfile to create the tgz
-FROM docker.io/fortio/fortio.build:v60@sha256:18c2427ade8e8867ec8e89a65702af479dd39fde15cee6899d08e387231fc090 as stage
+FROM docker.io/fortio/fortio.build:v61@sha256:98038f5f81bdc65fcc1a99abcba1ff6a2e22f60d627d26ad75ad8d952888e8f7 as stage
 ARG archs="amd64 arm64 ppc64le s390x"
 ENV archs=${archs}
 # Build image defaults to build user, switch back to root for