添加开放原子容器镜像解决拉取基础镜像超时 (#767)

* 添加开放原子容器镜像解决拉取基础镜像超时 * update * fix script error * update make.sphp
swoole · Sep 20, 2024 · 6595588 · 6595588
1 parent c58cec7
commit 6595588
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/sapi/docker/build-export-container.sh b/sapi/docker/build-export-container.sh
@@ -49,6 +49,11 @@ while [ $# -gt 0 ]; do
   shift $(($# > 0 ? 1 : 0))
 done
 
+case "$MIRROR" in
+china | openatom)
+  CONTAINER_BASE_IMAGE="hub.atomgit.com/library/alpine:3.18"
+  ;;
+esac
 
 mkdir -p var/build-export-container/
 cd ${__PROJECT__}/var/build-export-container/

diff --git a/sapi/quickstart/linux/run-alpine-container.sh b/sapi/quickstart/linux/run-alpine-container.sh
@@ -18,7 +18,23 @@ cd ${__DIR__}
   echo $?
 }
 cd ${__DIR__}
+
 IMAGE=alpine:3.18
 
+MIRROR=''
+while [ $# -gt 0 ]; do
+  case "$1" in
+  --mirror)
+    MIRROR="$2"
+    case "$MIRROR" in
+      china | openatom)
+        IMAGE="hub.atomgit.com/library/alpine:3.18"
+        ;;
+    esac
+    ;;
+  esac
+  shift $(($# > 0 ? 1 : 0))
+done
+
 cd ${__DIR__}
 docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
diff --git a/sapi/quickstart/linux/run-debian-container.sh b/sapi/quickstart/linux/run-debian-container.sh
@@ -18,8 +18,24 @@ cd ${__DIR__}
   echo $?
 }
 cd ${__DIR__}
-IMAGE=debian:11
+
 IMAGE=debian:12
 
+MIRROR=''
+while [ $# -gt 0 ]; do
+  case "$1" in
+  --mirror)
+    MIRROR="$2"
+    case "$MIRROR" in
+      china | openatom)
+        IMAGE="hub.atomgit.com/library/debian:12"
+        ;;
+    esac
+    ;;
+  esac
+  shift $(($# > 0 ? 1 : 0))
+done
+
+
 cd ${__DIR__}
 docker run --rm --name swoole-cli-debian-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
diff --git a/sapi/src/template/make.php b/sapi/src/template/make.php
@@ -317,8 +317,14 @@
 
 if [ "$1" = "docker-build" ] ;then
     MIRROR=""
+    CONTAINER_BASE_IMAGE='docker.io/library/alpine:3.18'
     if [ -n "$2" ]; then
         MIRROR=$2
+        case "$MIRROR" in
+        china | openatom )
+            CONTAINER_BASE_IMAGE="hub.atomgit.com/library/alpine:3.18"
+        ;;
+        esac
     fi
     PLATFORM=''
     ARCH=$(uname -m)
@@ -331,13 +337,15 @@
       ;;
     esac
     cd ${__PROJECT_DIR__}/sapi/docker
-    docker build --no-cache -t <?= Preprocessor::IMAGE_NAME ?>:<?= $this->getBaseImageTag() ?> -f Dockerfile  . --build-arg="MIRROR=${MIRROR}" --progress=plain  --platform=${PLATFORM}
+    echo "MIRROR=${MIRROR}"
+    echo "BASE_IMAGE=${CONTAINER_BASE_IMAGE}"
+    docker build --no-cache -t <?= Preprocessor::IMAGE_NAME ?>:<?= $this->getBaseImageTag() ?> -f Dockerfile  . --build-arg="MIRROR=${MIRROR}" --progress=plain  --platform=${PLATFORM} --build-arg="BASE_IMAGE=${CONTAINER_BASE_IMAGE}"
     exit 0
 elif [ "$1" = "docker-bash" ] ;then
     container=$(docker ps -a -f name=<?= Preprocessor::CONTAINER_NAME ?> | tail -n +2 2> /dev/null)
     base_image=$(docker images <?= Preprocessor::IMAGE_NAME ?>:<?= $this->getBaseImageTag() ?> | tail -n +2 2> /dev/null)
     image=$(docker images <?= Preprocessor::IMAGE_NAME ?>:<?= $this->getImageTag() ?> | tail -n +2 2> /dev/null)
-    CONTAINER_STATE=$(docker inspect -f {{.State.Running}} <?= Preprocessor::CONTAINER_NAME ?> 2> /dev/null)
+    CONTAINER_STATE=$(docker inspect -f "{{.State.Running}}" <?= Preprocessor::CONTAINER_NAME ?> 2> /dev/null)
     if [[ "${CONTAINER_STATE}" != "true" ]]; then
         bash ./make.sh docker-stop
         container=''