fix(registry): fix test case

Author: duanhongyi

Makefile

@@ -13,7 +13,7 @@ SHELL_SCRIPTS = $(wildcard rootfs/bin/* _scripts/*.sh contrib/ci/*.sh)
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := quay.io/drycc/go-dev:v0.22.0
+DEV_ENV_IMAGE := 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}

contrib/ci/test.sh

@@ -10,12 +10,16 @@ echo "registry-bucket" > "${CURRENT_DIR}"/tmp/aws-user/registry-bucket
 echo "1234567890123456789012345678901234567890" > "${CURRENT_DIR}"/tmp/aws-user/accesskey
 echo "1234567890123456789012345678901234567890" > "${CURRENT_DIR}"/tmp/aws-user/secretkey
 
-MINIO_JOB=$(docker run -d \
+MINIO_JOB=$(docker run -d --name minio \
   -v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/objectstore/creds \
-  quay.io/drycc/minio:canary server /home/minio/)
+  drycc/minio:canary server /home/minio/)
 
+sleep 5
+docker logs "${MINIO_JOB}"
 
-JOB=$(docker run -d \
+JOB=$(docker run -d --link minio:minio \
+  -e DRYCC_MINIO_SERVICE_HOST=minio \
+  -e DRYCC_MINIO_SERVICE_PORT=9000 \
   -v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/objectstore/creds \
   "$1")
 

rootfs/Dockerfile

@@ -1,4 +1,4 @@
-FROM minio/mc:RELEASE.2019-05-23T01-33-27Z as mc
+FROM minio/mc:RELEASE.2020-07-17T02-52-20Z as mc
 
 FROM registry:2.7
 

rootfs/bin/create_bucket

@@ -3,6 +3,6 @@
 # shellcheck disable=SC1091
 source /bin/normalize_storage
 has_bucket=$(mc ls minio -json|jq -r '.key'|grep -w "${MINIO_BUCKET}")
-if  [ ! -n "$has_bucket" ] ;then
+if  [ -z "$has_bucket" ] ;then
     mc mb minio/"${MINIO_BUCKET}"
 fi