update GOLANG_VERSION=1.16

Author: 王瑞华

.version

@@ -1,2 +1,3 @@
 OPENCV_VERSION=4.5.0
 GOLANG_VERSION=1.16
+GOCV_VERSION=0.25.0

Makefile

@@ -1,5 +1,6 @@
 OPENCV_VERSION := $(shell grep OPENCV_VERSION .version | cut -d '=' -f '2')
 GOLANG_VERSION := $(shell grep GOLANG_VERSION .version | cut -d '=' -f 2)
+GOCV_VERSION := $(shell grep GOCV_VERSION .version | cut -d '=' -f 2)
 PLATFORM := linux/amd64,linux/arm64
 
 opencv.merge:
@@ -31,6 +32,7 @@ gocv:
 		--tag=querycap/gocv-debian:$(GOLANG_VERSION)-ffmpeg-buster \
 		--build-arg=GOLANG_VERSION=$(GOLANG_VERSION)	\
 		--build-arg=OPENCV_VERSION=$(OPENCV_VERSION)	\
+		--build-arg=GOCV_VERSION=${GOCV_VERSION}	\
 		.
 
 opencv.runtime:

README.md

@@ -3,8 +3,8 @@
 opencv + ffmpeg + debian 
 
 + debian: buster
-+ golang: 1.15.2
-+ opencv: 4.4.0
++ golang: 1.16
++ opencv: 4.5.0
 
 ## images
 

gocv.Dockerfile

@@ -5,6 +5,7 @@ LABEL maintainer="querycap"
 LABEL DATE="2020-11-19"
 
 ARG GOLANG_VERSION
+ARG GOCV_VERSION
 ARG TARGETARCH
 ENV GOLANG_VERSION $GOLANG_VERSION
 
@@ -24,7 +25,7 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 WORKDIR $GOPATH
 
 RUN go get -u -d gocv.io/x/gocv  \
-    && cd $GOPATH/src/gocv.io/x/gocv/cmd/version/ \
+    && cd $GOPATH/pkg/mod/gocv.io/x/gocv@v${GOCV_VERSION}/cmd/version \
     && go build -o /usr/bin/gocv_version -i main.go
 
 CMD ["/usr/bin/gocv_version"]