feat(docker): dealing with the change of docker in kubenetes 1.20

Author: duanhongyi

Makefile

@@ -13,7 +13,7 @@ SHELL_SCRIPTS = $(wildcard _scripts/*.sh contrib/ci/*.sh rootfs/bin/*)
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := drycc/go-dev
+DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}

charts/database/templates/database-deployment.yaml

@@ -22,7 +22,7 @@ spec:
       serviceAccount: drycc-database
       containers:
         - name: drycc-database
-          image: {{.Values.image_registry}}{{.Values.org}}/postgres:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.org}}/postgres:{{.Values.image_tag}}
           imagePullPolicy: {{.Values.image_pull_policy}}
           ports:
             - containerPort: 5432

charts/database/values.yaml

@@ -1,7 +1,7 @@
 org: "drycc"
 image_pull_policy: "Always"
 image_tag: "canary"
-image_registry: ""
+image_registry: "docker.io"
 # limits_cpu: "100m"
 # limits_memory: "50Mi"
 timeout: "1200"

versioning.mk

@@ -1,8 +1,8 @@
 MUTABLE_VERSION ?= canary
 VERSION ?= git-$(shell git rev-parse --short HEAD)
 
-IMAGE := ${DRYCC_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
-MUTABLE_IMAGE := ${DRYCC_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
+IMAGE := ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
+MUTABLE_IMAGE := ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
 
 info:
 	@echo "Build tag:       ${VERSION}"