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

Author: duanhongyi

Makefile

@@ -4,7 +4,7 @@ include versioning.mk
 
 # dockerized development environment variables
 REPO_PATH := github.com/drycc/${SHORT_NAME}
-DEV_ENV_IMAGE := drycc/go-dev
+DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}

charts/builder/templates/builder-deployment.yaml

@@ -24,7 +24,7 @@ spec:
       serviceAccount: drycc-builder
       containers:
         - name: drycc-builder
-          image: {{.Values.image_registry}}{{.Values.org}}/builder:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.org}}/builder:{{.Values.image_tag}}
           imagePullPolicy: {{.Values.image_pull_policy}}
           ports:
             - containerPort: 2223

charts/builder/values.yaml

@@ -1,7 +1,7 @@
 org: "drycc"
 image_pull_policy: "Always"
 image_tag: "canary"
-image_registry: ""
+image_registry: "docker.io"
 service:
   # Service type default to LoadBalancer
   type: ClusterIP

versioning.mk

@@ -2,8 +2,8 @@ MUTABLE_VERSION ?= canary
 VERSION ?= git-$(shell git rev-parse --short HEAD)
 IMAGE_PREFIX ?= drycc
 
-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}"