*: improve docker scripts (#104)

.dockerignore

@@ -0,0 +1,11 @@
+.git/
+**/bin
+**/test
+**/*.iml
+**/.idea
+**/*.swp
+**/.DS_Store
+**/vendor
+**/work
+**/.vscode/
+**/.cover*

.github/workflows/common.yml

@@ -55,7 +55,7 @@ jobs:
           path: |
             ${{ env.GOCACHE }}
             ${{ env.GOMODCACHE }}
-          key: ${{ runner.os }}-go-${{ inputs.ref }}
+          key: ${{ runner.os }}-go-${{ inputs.target == "cache" && github.run_id || hashFiles('**/go.sum')}}
           restore-keys: |
             ${{ runner.os }}-go-
       - name: make ${{ inputs.target }} 

Makefile

@@ -13,24 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PROJECTNAME = $(shell basename "$(PWD)")
 GOBIN := $(shell pwd)/bin
-DOCKERFLAG ?=
-RELEASE ?=
-ifneq ($(RELEASE), "")
-	DOCKERFLAG ?= --squash
-endif
+DEBUG ?=
+DOCKERPREFIX ?=
 BUILD_TAGS ?=
 LDFLAGS ?= 
-DEBUG ?=
 BUILDFLAGS := $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -tags '${BUILD_TAGS}'
-ifeq ("$(WITH_RACE)", "1")
+ifneq ("$(DEBUG)", "")
 	BUILDFLAGS += -race
 endif
 IMAGE_TAG ?= latest
 EXECUTABLE_TARGETS := $(patsubst cmd/%,cmd_%,$(wildcard cmd/*))
 
-.PHONY: cmd_% test lint docker golangci-lint gocovmerge
+.PHONY: cmd_% test lint docker docker-release golangci-lint gocovmerge
 
 default: cmd
 
@@ -64,4 +59,7 @@ test: gocovmerge
 	go tool cover -html=.cover -o .cover.html
 
 docker:
-	docker build $(DOCKERFLAG) -t "tiproxy:${IMAGE_TAG}" --build-arg='GOPROXY=$(shell go env GOPROXY),BUILDFLAGS=$(BUILDFLAGS),' -f docker/Dockerfile .
+	docker build -t "$(DOCKERPREFIX)tiproxy:$(IMAGE_TAG)" --build-arg 'GOPROXY=$(shell go env GOPROXY),BUILDFLAGS=$(BUILDFLAGS),' -f docker/Dockerfile .
+
+docker-release:
+	docker buildx build --platform linux/amd64,linux/arm64 --push -t "$(DOCKERPREFIX)tiproxy:$(IMAGE_TAG)" --build-arg 'GOPROXY=$(shell go env GOPROXY),BUILDFLAGS=$(BUILDFLAGS),' -f docker/Dockerfile .

docker/Dockerfile

@@ -4,15 +4,9 @@ EXPOSE 3080
 EXPOSE 3081
 EXPOSE 6000
 
-ADD cmd proxy/cmd
-ADD lib proxy/lib
-ADD pkg proxy/pkg
-ADD conf proxy/conf
-ADD go.* docker/apk-fastest-mirror.sh Makefile proxy/
-RUN sh ./proxy/apk-fastest-mirror.sh
-RUN apk add --no-cache --progress git make go
+ADD . https://raw.githubusercontent.com/njhallett/apk-fastest-mirror/main/apk-fastest-mirror.sh /proxy
+RUN sh ./proxy/apk-fastest-mirror.sh -t 50 && apk add --no-cache --progress git make go
 ARG BUILDFLAGS
 ARG GOPROXY
-RUN export BUILDFLAGS=${BUILDFLAGS} && export GOPROXY=${GOPROXY} && cd proxy && make cmd && cp bin/* /bin/ && cp -a conf /etc/proxy && cd .. && rm -rf proxy
-RUN rm -rf $(go env GOMODCACHE GOCACHE) && apk del git make go
+RUN export BUILDFLAGS=${BUILDFLAGS} && export GOPROXY=${GOPROXY} && cd proxy && make cmd && cp bin/* /bin/ && cp -a conf /etc/proxy && cd .. && rm -rf proxy && rm -rf $(go env GOMODCACHE GOCACHE GOPATH) && apk del git make go
 ENTRYPOINT ["/bin/tiproxy", "-conf", "/etc/proxy/proxy.yaml"]