Auto generated from templates by gromit

ci/Dockerfile.std

@@ -1,6 +1,5 @@
-
 # Generated by: gromit policy
-# Generated on: Fri Aug 18 08:07:54 UTC 2023
+# Generated on: Wed Jan 17 08:47:43 UTC 2024
 
 FROM debian:bullseye-slim
 ARG TARGETARCH
@@ -9,24 +8,19 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
     && apt-get dist-upgrade -y ca-certificates
-# Install curl and python3
-RUN apt-get install -y curl python3-setuptools libpython3.9 python3.9-dev \
-    && curl https://bootstrap.pypa.io/get-pip.py | python3 \
-    && pip3 install --only-binary ":all:" grpcio protobuf==3.20.2 && pip3 install --upgrade setuptools
+# For Python plugins
+RUN apt-get install -y python3-setuptools libpython3-dev python3-dev python3-grpcio
 
 # Remove some things to decrease CVE surface
-RUN  apt-get remove -y --allow-remove-essential --auto-remove curl libtiff5 ncurses-base \
-	&& rm /usr/bin/passwd && rm /usr/sbin/adduser
+RUN dpkg --purge --force-remove-essential curl ncurses-base || true
+RUN rm -fv /usr/bin/passwd /usr/sbin/adduser || true
 
 # Clean up caches, unwanted .a and .o files
 RUN rm -rf /root/.cache \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /usr/include/* \
-    && find /usr/lib -type f -name '*.a' -delete \
-    && find /usr/lib -type f -name '*.o' -delete
-# Print included pip/python versions
-RUN pip3 --version && python3 --version
+    && find /usr/lib -type f -name '*.a' -o -name '*.o' -delete
 
 # Comment this to test in dev
 COPY *${TARGETARCH}.deb /
@@ -41,5 +35,4 @@ WORKDIR /opt/tyk-gateway/
 # Uncomment this to test in dev
 # COPY tyk .
 ENTRYPOINT ["/opt/tyk-gateway/tyk" ]
-
 CMD [ "--conf=/opt/tyk-gateway/tyk.conf" ]

ci/goreleaser/goreleaser-el7.yml

@@ -1,5 +1,5 @@
 # Generated by: gromit policy
-# Generated on: Wed Jul 26 07:56:17 UTC 2023
+# Generated on: Wed Jan 17 08:47:43 UTC 2024
 
 # Check the documentation at http://goreleaser.com
 # This project needs CGO_ENABLED=1 and the cross-compiler toolchains for
@@ -17,9 +17,6 @@ builds:
       - -X github.com/TykTechnologies/tyk/internal/build.BuiltBy=goreleaser
     goos:
       - linux
-    env:
-      - CGO_ENABLED=1
-      - GO111MODULE=off
     goarch:
       - amd64
     binary: tyk
@@ -33,14 +30,26 @@ builds:
       - -X github.com/TykTechnologies/tyk/internal/build.BuiltBy=goreleaser
     env:
       - CC=aarch64-linux-gnu-gcc
-      - CGO_ENABLED=1
-      - GO111MODULE=off
     goos:
       - linux
     goarch:
       - arm64
     binary: tyk
-
+  - id: std-s390x
+    flags:
+      - -tags=goplugin
+    ldflags:
+      - -X github.com/TykTechnologies/tyk/internal/build.Version={{.Version}}
+      - -X github.com/TykTechnologies/tyk/internal/build.Commit={{.FullCommit}}
+      - -X github.com/TykTechnologies/tyk/internal/build.BuildDate={{.Date}}
+      - -X github.com/TykTechnologies/tyk/internal/build.BuiltBy=goreleaser
+    env:
+      - CC=s390x-linux-gnu-gcc
+    goos:
+      - linux
+    goarch:
+      - s390x
+    binary: tyk
 nfpms:
   - id: std
     vendor: "Tyk Technologies Ltd"
@@ -52,6 +61,7 @@ nfpms:
     builds:
       - std-linux
       - std-arm64
+      - std-s390
     formats:
       - deb
       - rpm
@@ -100,7 +110,6 @@ nfpms:
       signature:
         key_file: tyk.io.signing.key
         type: origin
-
 publishers:
   - name: tyk-gateway-unstable
     env:
@@ -109,19 +118,12 @@ publishers:
       - RPMVERS={{ .Env.RPMVERS }}
       - DEBVERS={{ .Env.DEBVERS }}
     cmd: /pc.sh {{ .ArtifactPath }}
-
-
 # This disables archives
 archives:
   - format: binary
     allow_different_binary_count: true
-
-# plugin-compiler now built from a separate independent workflow
-# that also takes care of the el7 plugin compiler build
-
 checksum:
   disable: true
-
 release:
   disable: true
   github: