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

Add s390x support for pump #704

Closed
wants to merge 4 commits into from
+8 −5
Closed

Add s390x support for pump #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3a84cc
Update ci/Dockerfile.std
sweep-ai[bot] Aug 7, 2023
1980003
Update ci/goreleaser/goreleaser.yml
sweep-ai[bot] Aug 7, 2023
f926617
Update ci/Dockerfile.std
sweep-ai[bot] Aug 7, 2023
47d82bc
Merge main into sweep/add-s390x-support_2
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: 3 additions & 4 deletions ci/Dockerfile.std
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Generated on: Wed Jul 26 08:25:03 UTC 2023

FROM debian:bullseye-slim
ARG TARGETARCH

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -24,8 +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 exact_filename.deb /
RUN dpkg -i /tyk-pump_exact_filename.deb && rm /*.deb

ARG PORTS

Expand All @@ -37,4 +36,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" ]
6 changes: 5 additions & 1 deletion 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 @@ -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}}"
Expand Down Expand Up @@ -138,4 +142,4 @@ release:
name: tyk-pump
prerelease: auto
draft: true
name_template: "{{.ProjectName}}-v{{.Version}}"
name_template: "{{.ProjectName}}-v{{.Version}}"