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.

Sign up for GitHub

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

Jump to bottom

Add s390x support for pump #703

Closed
wants to merge 3 commits into from
Closed

Add s390x support for pump #703

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d786201
Update ci/Dockerfile.std
sweep-ai[bot] Aug 7, 2023
85e19a2
Update ci/goreleaser/goreleaser.yml
sweep-ai[bot] Aug 7, 2023
008db42
Merge main into sweep/add-s390x-support_3
sweep-ai[bot] Aug 8, 2023
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
7 changes: 5 additions & 2 deletions ci/Dockerfile.std
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" ]
13 changes: 7 additions & 6 deletions ci/goreleaser/goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ builds:
goarch:
- amd64
- arm64
- s390x
binary: tyk-pump

dockers:
Expand All @@ -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:
Expand Down Expand Up @@ -138,4 +139,4 @@ release:
name: tyk-pump
prerelease: auto
draft: true
name_template: "{{.ProjectName}}-v{{.Version}}"
name_template: "{{.ProjectName}}-v{{.Version}}"
Loading