From d3a84ccad42bc289286aa793c1d88499cc8e70bc Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:58:21 +0000 Subject: [PATCH 1/3] Update ci/Dockerfile.std --- ci/Dockerfile.std | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/Dockerfile.std b/ci/Dockerfile.std index cce463d35..075be74c3 100644 --- a/ci/Dockerfile.std +++ b/ci/Dockerfile.std @@ -4,6 +4,8 @@ FROM debian:bullseye-slim ARG TARGETARCH +FROM debian:bullseye-slim-s390x +ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive @@ -26,6 +28,8 @@ RUN rm -rf /root/.cache \ # Comment this to test in dev COPY *${TARGETARCH}.deb / RUN dpkg -i /tyk-pump*${TARGETARCH}.deb && rm /*.deb +COPY *s390x.deb / +RUN dpkg -i /tyk-pump*s390x.deb && rm /*.deb ARG PORTS @@ -37,4 +41,4 @@ WORKDIR /opt/tyk-pump/ # COPY tyk-pump . ENTRYPOINT ["/opt/tyk-pump/tyk-pump" ] -CMD [ "--conf=/opt/tyk-pump/pump.conf" ] +CMD [ "--conf=/opt/tyk-pump/pump.conf" ] \ No newline at end of file From 1980003595480446753ac583a2c7f0fc7a07b73e Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:59:02 +0000 Subject: [PATCH 2/3] Update ci/goreleaser/goreleaser.yml --- ci/goreleaser/goreleaser.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/goreleaser/goreleaser.yml b/ci/goreleaser/goreleaser.yml index d7666a2b4..acf2cd2d7 100644 --- a/ci/goreleaser/goreleaser.yml +++ b/ci/goreleaser/goreleaser.yml @@ -14,6 +14,7 @@ builds: goarch: - amd64 - arm64 + - s390x binary: tyk-pump dockers: @@ -23,9 +24,12 @@ dockers: image_templates: - "tykio/tyk-pump-docker-pub:{{ .Tag }}-amd64" - "docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-amd64" + - "tykio/tyk-pump-docker-pub:{{ .Tag }}-s390x" + - "docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-s390x" build_flag_templates: - "--build-arg=PORTS=80" - "--platform=linux/amd64" + - "--platform=linux/s390x" - "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.title={{.ProjectName}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" @@ -138,4 +142,4 @@ release: name: tyk-pump prerelease: auto draft: true - name_template: "{{.ProjectName}}-v{{.Version}}" + name_template: "{{.ProjectName}}-v{{.Version}}" \ No newline at end of file From f926617194726bb59197789082ded9ba92ff71e6 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 16:02:48 +0000 Subject: [PATCH 3/3] Update ci/Dockerfile.std --- ci/Dockerfile.std | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ci/Dockerfile.std b/ci/Dockerfile.std index 075be74c3..28c9aeb35 100644 --- a/ci/Dockerfile.std +++ b/ci/Dockerfile.std @@ -3,9 +3,6 @@ # Generated on: Wed Jul 26 08:25:03 UTC 2023 FROM debian:bullseye-slim -ARG TARGETARCH -FROM debian:bullseye-slim-s390x -ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive @@ -26,10 +23,8 @@ RUN rm -rf /root/.cache \ && find /usr/lib -type f -name '*.o' -delete # Comment this to test in dev -COPY *${TARGETARCH}.deb / -RUN dpkg -i /tyk-pump*${TARGETARCH}.deb && rm /*.deb -COPY *s390x.deb / -RUN dpkg -i /tyk-pump*s390x.deb && rm /*.deb +COPY exact_filename.deb / +RUN dpkg -i /tyk-pump_exact_filename.deb && rm /*.deb ARG PORTS