Skip to content

Commit

Permalink
Remove gocenter.io proxy, use go 1.15
Browse files Browse the repository at this point in the history
  • Loading branch information
rimusz committed Jun 17, 2021
1 parent 8c9e414 commit b092f8b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM golang:1.13-alpine AS builder
MAINTAINER "<rmocius@gmail..com>"
FROM golang:1.15-alpine AS builder

ARG srcpath="/build/hostpath-provisioner"

Expand All @@ -9,7 +8,7 @@ RUN apk --no-cache add git && \
ADD . "$srcpath"

RUN cd "$srcpath" && \
GO111MODULE=on GOPROXY=https://gocenter.io \
GO111MODULE=on \
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
go build -a -ldflags '-extldflags "-static"' -o /hostpath-provisioner

Expand Down
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#
IMAGE?=quay.io/rimusz/hostpath-provisioner

TAG_GIT=$(IMAGE):v0.2.3
TAG_GIT=$(IMAGE):v0.2.4
TAG_LATEST=$(IMAGE):latest

PHONY: all
all: image push

PHONY: test-image
test-image:
docker build -t hostpath-provisioner -f Dockerfile .

PHONY: all
all: image push

PHONY: image
image:
docker build -t $(TAG_GIT) -f Dockerfile .
Expand All @@ -24,6 +24,5 @@ push:
PHONY: hostpath-provisioner
hostpath-provisioner: export CGO_ENABLED=0
hostpath-provisioner: export GO111MODULE=on
hostpath-provisioner: export GOPROXY=https://gocenter.io
hostpath-provisioner: $(shell find . -name "*.go")
go build -a -ldflags '-extldflags "-static"' -o hostpath-provisioner .
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ require (
sigs.k8s.io/yaml v1.1.0 // indirect
)

go 1.13
go 1.15

0 comments on commit b092f8b

Please sign in to comment.