Skip to content

Commit

Permalink
fix makefile version
Browse files Browse the repository at this point in the history
  • Loading branch information
galal-hussein committed May 8, 2024
1 parent 91f0469 commit beb9ae1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BCI_IMAGE=registry.suse.com/bci/bci-base
ARG GO_IMAGE=rancher/hardened-build-base:v1.20.12b2
ARG GO_IMAGE=rancher/hardened-build-base:v1.22.3b1
FROM ${BCI_IMAGE} as bci
FROM ${GO_IMAGE} as builder
ARG ARCH="amd64"
Expand All @@ -25,7 +25,7 @@ RUN curl -LO https://github.com/google/protobuf/releases/download/v3.17.3/protoc
# setup containerd build
ARG SRC="github.com/k3s-io/containerd"
ARG PKG="github.com/containerd/containerd"
ARG TAG="v1.6.14-k3s1"
ARG TAG="v1.7.11-k3s1"
RUN git clone --depth=1 https://${SRC}.git ${GOPATH}/src/${PKG}
WORKDIR $GOPATH/src/${PKG}
RUN git fetch --tags --depth=1 origin ${TAG}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BUILD_META=-build$(shell TZ=UTC date +%Y%m%d)
ORG ?= rancher
PKG ?= github.com/containerd/containerd
SRC ?= github.com/k3s-io/containerd
TAG ?= v1.6.19-k3s1$(BUILD_META)
TAG ?= v1.7.11-k3s1$(BUILD_META)

ifneq ($(DRONE_TAG),)
TAG := $(DRONE_TAG)
Expand Down Expand Up @@ -72,4 +72,4 @@ log:
@echo "SRC=$(SRC)"
@echo "BUILD_META=$(BUILD_META)"
@echo "K3S_ROOT_VERSION=$(K3S_ROOT_VERSION)"
@echo "UNAME_M=$(UNAME_M)"
@echo "UNAME_M=$(UNAME_M)"

0 comments on commit beb9ae1

Please sign in to comment.