From d786201b6b5aad9bb089f7199c7db478c2f225ff 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:31 +0000 Subject: [PATCH 1/2] Update ci/Dockerfile.std --- ci/Dockerfile.std | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/Dockerfile.std b/ci/Dockerfile.std index cce463d35..71a9caf64 100644 --- a/ci/Dockerfile.std +++ b/ci/Dockerfile.std @@ -2,7 +2,7 @@ # Generated by: gromit policy # Generated on: Wed Jul 26 08:25:03 UTC 2023 -FROM debian:bullseye-slim +FROM debian:bullseye-slim AS build ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive @@ -33,8 +33,11 @@ EXPOSE $PORTS WORKDIR /opt/tyk-pump/ +FROM debian:bullseye-slim AS final +COPY --from=build /opt/tyk-pump/tyk-pump /opt/tyk-pump/tyk-pump + # Uncomment this to test in dev # 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 85e19a21caa880840d5437d6dd0a4696c3ce7d5b 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:57 +0000 Subject: [PATCH 2/2] Update ci/goreleaser/goreleaser.yml --- ci/goreleaser/goreleaser.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/goreleaser/goreleaser.yml b/ci/goreleaser/goreleaser.yml index d7666a2b4..4b43a522b 100644 --- a/ci/goreleaser/goreleaser.yml +++ b/ci/goreleaser/goreleaser.yml @@ -14,6 +14,7 @@ builds: goarch: - amd64 - arm64 + - s390x binary: tyk-pump dockers: @@ -39,21 +40,21 @@ dockers: - "README.md" - "LICENSE.md" - "pump.example.conf" - # Build tykio/tyk-pump-docker-pub, docker.tyk.io/tyk-pump/tyk-pump (arm64) + # Build tykio/tyk-pump-docker-pub, docker.tyk.io/tyk-pump/tyk-pump (s390x) - ids: - std image_templates: - - "tykio/tyk-pump-docker-pub:{{ .Tag }}-arm64" - - "docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-arm64" + - "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/arm64" + - "--platform=linux/s390x" - "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.title={{.ProjectName}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.version={{.Version}}" use: buildx - goarch: arm64 + goarch: s390x goos: linux dockerfile: ci/Dockerfile.std extra_files: @@ -138,4 +139,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