Drop s390x and bump image-build-base

Signed-off-by: Brad Davidson <[email protected]>
rancher · Dec 8, 2023 · 94faaf7 · 94faaf7
1 parent b37d3da
commit 94faaf7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 57 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -9,15 +9,15 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.20.12b2
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
   - name: docker
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.20.12b2
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -34,7 +34,7 @@ steps:
     - tag
 
 - name: scan
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.20.12b2
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
@@ -57,15 +57,15 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.20.12b2
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
   - name: docker
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.20.12b2
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -82,57 +82,13 @@ steps:
     - tag
 
 - name: scan
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.20.12b2
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
   - name: docker
     path: /var/run/docker.sock
 
-volumes:
-- name: docker
-  host:
-    path: /var/run/docker.sock
----
-kind: pipeline
-name: linux-s390x
-
-platform:
-  os: linux
-  arch: amd64
-
-node:
-  arch: s390x
-
-steps:
-- name: build
-  pull: always
-  image: rancher/hardened-build-base:v1.20.7b3
-  failure: ignore
-  commands:
-  - make DRONE_TAG=${DRONE_TAG}
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-
-- name: publish
-  image: rancher/hardened-build-base:v1.20.7b3
-  failure: ignore
-  commands:
-  - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-  - make DRONE_TAG=${DRONE_TAG} image-push
-  environment:
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    DOCKER_USERNAME:
-      from_secret: docker_username
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-  when:
-    event:
-    - tag
-
 volumes:
 - name: docker
   host:
@@ -160,5 +116,4 @@ steps:
 depends_on:
 - linux-amd64
 - linux-arm64
-- linux-s390x
 ...
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG BCI_IMAGE=registry.suse.com/bci/bci-base
-ARG GO_IMAGE=rancher/hardened-build-base:v1.20.7b3
+ARG GO_IMAGE=rancher/hardened-build-base:v1.20.12b2
 FROM ${BCI_IMAGE} as bci
 FROM ${GO_IMAGE} as builder
 # setup required packages

diff --git a/manifest.tmpl b/manifest.tmpl
@@ -10,8 +10,3 @@ manifests:
     platform:
       architecture: arm64
       os: linux
-  -
-    image: rancher/hardened-runc:{{build.tag}}-s390x
-    platform:
-      architecture: s390x
-      os: linux