Skip to content

Commit

Permalink
Merge pull request #4 from dweomer/go-1.16-and-runc-rc94
Browse files Browse the repository at this point in the history
golang 1.16.4 and runc 1.0.0-rc94
  • Loading branch information
dweomer authored May 11, 2021
2 parents 4610f43 + 3530db8 commit d2f2b48
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ platform:
steps:
- name: build
pull: always
image: rancher/hardened-build-base:v1.15.8b5
image: rancher/hardened-build-base:v1.16.4b7
commands:
- make DRONE_TAG=${DRONE_TAG}
volumes:
- name: docker
path: /var/run/docker.sock

- name: publish
image: rancher/hardened-build-base:v1.15.8b5
image: rancher/hardened-build-base:v1.16.4b7
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- make DRONE_TAG=${DRONE_TAG} image-push image-manifest
Expand All @@ -34,7 +34,7 @@ steps:
- tag

- name: scan
image: rancher/hardened-build-base:v1.15.8b5
image: rancher/hardened-build-base:v1.16.4b7
commands:
- make DRONE_TAG=${DRONE_TAG} image-scan
volumes:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG UBI_IMAGE=registry.access.redhat.com/ubi7/ubi-minimal:latest
ARG GO_IMAGE=rancher/hardened-build-base:v1.15.8b5
ARG GO_IMAGE=rancher/hardened-build-base:v1.16.4b7
FROM ${UBI_IMAGE} as ubi
FROM ${GO_IMAGE} as builder
# setup required packages
Expand All @@ -15,7 +15,7 @@ RUN set -x \
# setup the build
ARG PKG="github.com/opencontainers/runc"
ARG SRC="github.com/opencontainers/runc"
ARG TAG="v1.0.0-rc92"
ARG TAG="v1.0.0-rc94"
RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
WORKDIR $GOPATH/src/${PKG}
RUN git fetch --all --tags --prune
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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-rc93$(BUILD_META)
TAG ?= v1.0.0-rc94$(BUILD_META)

ifneq ($(DRONE_TAG),)
TAG := $(DRONE_TAG)
Expand Down

0 comments on commit d2f2b48

Please sign in to comment.