From 94faaf748ad2c390fffbeebcc09d7330fd6fca0b Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Fri, 8 Dec 2023 22:06:59 +0000
Subject: [PATCH] Drop s390x and bump image-build-base

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 .drone.yml    | 57 ++++++---------------------------------------------
 Dockerfile    |  2 +-
 manifest.tmpl |  5 -----
 3 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index deda6c4..a19e2e6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,7 +9,7 @@ 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:
@@ -17,7 +17,7 @@ steps:
     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,7 +57,7 @@ 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:
@@ -65,7 +65,7 @@ steps:
     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
index 53dc152..adfe801 100644
--- 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
index a840c50..2b787a1 100644
--- 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