Skip to content

Commit

Permalink
Merge pull request #468 from Iceber/bump_alpine_image
Browse files Browse the repository at this point in the history
bump alpine image from 3.14 to 3.16.3
  • Loading branch information
Iceber authored Dec 7, 2022
2 parents 83776f1 + e65e55b commit cda43af
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
ARG BUILDER_IMAGE
ARG BASE_IMAGE

FROM --platform=$BUILDPLATFORM ${BUILDER_IMAGE} as builder
WORKDIR /clusterpedia

ARG BIN_NAME
ARG TARGETARCH
RUN GOARCH=${TARGETARCH} /builder.sh ${BIN_NAME}

FROM ${BASE_IMAGE}
FROM alpine:3.16.3
RUN apk add --no-cache gcompat

ARG BIN_NAME
Expand Down
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ON_PLUGINS ?= true
BASE_IMAGE ?= "alpine:3.14"
REGISTRY ?= "ghcr.io/clusterpedia-io/clusterpedia"

GOOS ?= $(shell go env GOOS)
Expand Down Expand Up @@ -103,7 +102,6 @@ image-apiserver:
-t $(REGISTRY)/apiserver-$(GOARCH):$(VERSION) \
--platform=linux/$(GOARCH) \
--load \
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg BUILDER_IMAGE=$(REGISTRY)/builder-$(HOSTARCH):$(BUILDER_IMAGE_TAG) \
--build-arg BIN_NAME=apiserver .

Expand All @@ -112,7 +110,6 @@ image-binding-apiserver:
-t $(REGISTRY)/binding-apiserver-$(GOARCH):$(VERSION) \
--platform=linux/$(GOARCH) \
--load \
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg BUILDER_IMAGE=$(REGISTRY)/builder-$(HOSTARCH):$(BUILDER_IMAGE_TAG) \
--build-arg BIN_NAME=binding-apiserver .

Expand All @@ -121,7 +118,6 @@ image-clustersynchro-manager:
-t $(REGISTRY)/clustersynchro-manager-$(GOARCH):$(VERSION) \
--platform=linux/$(GOARCH) \
--load \
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg BUILDER_IMAGE=$(REGISTRY)/builder-$(HOSTARCH):$(BUILDER_IMAGE_TAG) \
--build-arg BIN_NAME=clustersynchro-manager .

Expand All @@ -130,7 +126,6 @@ image-controller-manager:
-t $(REGISTRY)/controller-manager-$(GOARCH):$(VERSION) \
--platform=linux/$(GOARCH) \
--load \
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg BUILDER_IMAGE=$(REGISTRY)/builder-$(HOSTARCH):$(BUILDER_IMAGE_TAG) \
--build-arg BIN_NAME=controller-manager .

Expand Down

0 comments on commit cda43af

Please sign in to comment.