Bump golang and default tag

Signed-off-by: Brad Davidson <[email protected]>
rancher · Apr 6, 2023 · 04154d6 · 04154d6
1 parent 161a4e5
commit 04154d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 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.16.10b7
+  image: rancher/hardened-build-base:v1.20.3b1
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
   - name: docker
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.16.10b7
+  image: rancher/hardened-build-base:v1.20.3b1
   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.16.10b7
+  image: rancher/hardened-build-base:v1.20.3b1
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
@@ -60,7 +60,7 @@ node:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.16.10b7
+  image: rancher/hardened-build-base:v1.20.3b1
   failure: ignore
   commands:
   - make DRONE_TAG=${DRONE_TAG}
@@ -69,7 +69,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.16.10b7
+  image: rancher/hardened-build-base:v1.20.3b1
   failure: ignore
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG BCI_IMAGE=registry.suse.com/bci/bci-base:15.3.17.20.12
-ARG GO_IMAGE=rancher/hardened-build-base:v1.16.10b7
+ARG GO_IMAGE=rancher/hardened-build-base:v1.20.3b1
 FROM ${BCI_IMAGE} as bci
 FROM ${GO_IMAGE} as builder
 # setup required packages
@@ -15,13 +15,13 @@ RUN set -x \
 # setup the build
 ARG PKG="github.com/opencontainers/runc"
 ARG SRC="github.com/opencontainers/runc"
-ARG TAG="v1.0.2"
+ARG TAG="v1.1.5"
 ARG ARCH="amd64"
 RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
 WORKDIR $GOPATH/src/${PKG}
 RUN git fetch --all --tags --prune
 RUN git checkout tags/${TAG} -b ${TAG}
-RUN BUILDTAGS='seccomp selinux apparmor' make static
+RUN BUILDTAGS='seccomp selinux apparmor' GOEXPERIMENT='boringcrypto' make static
 RUN go-assert-static.sh runc
 RUN if [ "${ARCH}" != "s390x" ]; then \
     	go-assert-boring.sh runc; \

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ BUILD_META=-build$(shell date +%Y%m%d)
 ORG ?= rancher
 PKG ?= github.com/opencontainers/runc
 SRC ?= github.com/opencontainers/runc
-TAG ?= v1.0.0-rc95$(BUILD_META)
+TAG ?= v1.1.5$(BUILD_META)
 
 ifneq ($(DRONE_TAG),)
 TAG := $(DRONE_TAG)