Skip to content

Commit 3a02f16

Browse files
committed
Fix docker
1 parent 755ee15 commit 3a02f16

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG IMAGE
2-
FROM alpine:${IMAGE}
2+
FROM ${IMAGE}
33
MAINTAINER Max Neunhoeffer <[email protected]>
44

55
ARG TARGETARCH

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ ifeq (, $(findstring -preview,$(VERSION)))
2121
-t $(IMAGE_NAME):latest
2222
endif
2323

24-
ALPINE_IMAGE ?= 3.18
25-
2624
GOBUILDLINKTARGET := ../../../..
2725

2826
BUILDDIR ?= $(ROOTDIR)
@@ -39,9 +37,11 @@ REPONAME := $(PROJECT)
3937
REPODIR := $(ORGDIR)/$(REPONAME)
4038
REPOPATH := $(ORGPATH)/$(REPONAME)
4139

40+
ALPINE_IMAGE ?= alpine:3.18
41+
4242
GOPATH := $(GOBUILDDIR)
4343
GOVERSION := 1.21.6
44-
GOIMAGE ?= golang:$(GOVERSION)-alpine$(ALPINE_IMAGE)
44+
GOIMAGE ?= golang:$(GOVERSION)-alpine3.18
4545

4646
GOOS ?= linux
4747
GOARCH ?= amd64

0 commit comments

Comments
 (0)