dockerfile 和 dockerfile-arm64 合并为一个 (swoole#777)

* 使用 tini 正确地回收其子进程

* format bash script

* 合并dockerfile dockerfile-arm64

* 自动指定构建容器的架构

* 构建容器指定架构

sapi/docker/Dockerfile

@@ -1,4 +1,6 @@
-FROM alpine:3.20
+ARG BASE_IMAGE="alpine:3.20"
+FROM ${BASE_IMAGE}
+# FROM alpine:3.18
 
 ARG MIRROR=""
 

sapi/docker/build-export-container.sh

@@ -1,4 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+: <<'COMMENT'
+
+  从运行中的容器 将 /usr/local/swoole-cli/ 文件夹 拷贝出来 并生成新容器镜像 ，并把新容器镜像导出为文件
+
+COMMENT
 
 set -exu
 __DIR__=$(
@@ -12,23 +18,58 @@ __PROJECT__=$(
 cd ${__DIR__}
 cd ${__PROJECT__}
 
+# alpine 基础镜像 支持多架构
+
+CONTAINER_BASE_IMAGE='docker.io/library/alpine:3.18'
+CONTAIENR_NAME='swoole-cli-builder'
+MIRROR=''
+PLATFORM=''
+ARCH=$(uname -m)
+case $ARCH in
+'x86_64')
+  PLATFORM='linux/amd64'
+  ;;
+'aarch64')
+  PLATFORM='linux/arm64'
+  ;;
+esac
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+  --platform)
+    PLATFORM="$2"
+    ;;
+  --mirror)
+    MIRROR="$2"
+    ;;
+  --*)
+    echo "Illegal option $1"
+    ;;
+  esac
+  shift $(($# > 0 ? 1 : 0))
+done
+
+
 mkdir -p var/build-export-container/
 cd ${__PROJECT__}/var/build-export-container/
 
 test -d swoole-cli && rm -rf swoole-cli
 
-container_id='swoole-cli-builder'
-docker cp $container_id:/usr/local/swoole-cli/ .
+docker cp ${CONTAIENR_NAME}:/usr/local/swoole-cli/ .
 
+cat >Dockerfile <<'EOF'
+ARG BASE_IMAGE="alpine:3.18"
+FROM ${BASE_IMAGE}
+# FROM alpine:3.18
 
-cat > Dockerfile <<'EOF'
-FROM alpine:3.18
+ARG MIRROR=""
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ENV TZ=Etc/UTC
 
 RUN test -f /etc/apk/repositories.save || cp /etc/apk/repositories /etc/apk/repositories.save
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+RUN if [ "${MIRROR}" = "ustc" -o "${MIRROR}" = "china"   ]; then { sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories ; } fi
+RUN if [ "${MIRROR}" = "tuna" ]; then { sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories ; } fi
 
 RUN apk add ca-certificates tini
 ADD ./swoole-cli /usr/local/swoole-cli
@@ -42,48 +83,23 @@ ENTRYPOINT ["tini", "--"]
 
 EOF
 
-
-
-PLATFORM=''
-ARCH=$(uname -m)
-case $ARCH in
-'x86_64')
-  PLATFORM='linux/amd64'
-  ;;
-'aarch64')
-  PLATFORM='linux/arm64'
-  ;;
-esac
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-  --platform)
-    PLATFORM="$2"
-    ;;
-  --*)
-    echo "Illegal option $1"
-    ;;
-  esac
-  shift $(($# > 0 ? 1 : 0))
-done
-
 ARCH=$(uname -m)
 TIME=$(date -u '+%Y%m%dT%H%M%SZ')
 VERSION="1.6"
 TAG="v${VERSION}-${ARCH}-${TIME}"
 
 IMAGE="docker.io/phpswoole/swoole-cli-builder:${TAG}"
 
-docker  build -t ${IMAGE} -f ./Dockerfile . --progress=plain  --platform ${PLATFORM}
+echo "MIRROR=${MIRROR}"
+echo "BASE_IMAGE=${CONTAINER_BASE_IMAGE}"
+docker build --no-cache -t ${IMAGE} -f ./Dockerfile . --progress=plain --platform ${PLATFORM} --build-arg="MIRROR=${MIRROR}" --build-arg="BASE_IMAGE=${CONTAINER_BASE_IMAGE}"
 
 echo ${IMAGE}
-echo ${IMAGE} > container-image.txt
+echo ${IMAGE} >container-image.txt
 
 IMAGE_FILE="swoole-cli-builder.tar"
 docker save -o ${IMAGE_FILE} ${IMAGE}
 
 tar -cJvf "${IMAGE_FILE}.xz" ${IMAGE_FILE}
 
-
 # docker load -i "swoole-cli-builder-image.tar"
-

sapi/quickstart/linux/alpine-init-minimal.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 set -exu
 __DIR__=$(
@@ -10,7 +10,6 @@ cd ${__DIR__}
 # use china mirror
 # sh sapi/quickstart/linux/alpine-init-mini.sh --mirror [ china | ustc | tuna | tencentyun | huaweicloud ]
 
-
 MIRROR=''
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -28,8 +27,8 @@ case "$MIRROR" in
 china | tuna | ustc)
   test -f /etc/apk/repositories.save || cp /etc/apk/repositories /etc/apk/repositories.save
   test "$MIRROR" = "china" && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
-  test "$MIRROR" = "tuna"  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
-  test "$MIRROR" = "ustc"  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+  test "$MIRROR" = "tuna" && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+  test "$MIRROR" = "ustc" && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
   ;;
 tencentyun | huaweicloud) # 云服务的内网镜像源
   test -f /etc/apk/repositories.save || cp /etc/apk/repositories /etc/apk/repositories.save
@@ -41,4 +40,4 @@ esac
 
 apk update
 
-apk add bash git curl wget  xz zip unzip  ca-certificates
+apk add bash git curl wget xz zip unzip ca-certificates

sapi/quickstart/linux/alpine-init.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 set -exu
 __DIR__=$(
@@ -10,7 +10,6 @@ cd ${__DIR__}
 # use china mirror
 # sh sapi/quickstart/linux/alpine-init.sh --mirror [ china | ustc | tuna | tencentyun | huaweicloud ]
 
-
 MIRROR=''
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -28,8 +27,8 @@ case "$MIRROR" in
 china | tuna | ustc)
   test -f /etc/apk/repositories.save || cp /etc/apk/repositories /etc/apk/repositories.save
   test "$MIRROR" = "china" && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
-  test "$MIRROR" = "tuna"  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
-  test "$MIRROR" = "ustc"  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+  test "$MIRROR" = "tuna" && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+  test "$MIRROR" = "ustc" && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
   ;;
 tencentyun | huaweicloud) # 云服务的内网镜像源
   test -f /etc/apk/repositories.save || cp /etc/apk/repositories /etc/apk/repositories.save
@@ -66,10 +65,8 @@ china | tuna | ustc)
 tencentyun | huaweicloud)
   test "$MIRROR" = "tencentyun" && pip3 config set global.index-url https://mirrors.tencentyun.com/pypi/simple/
   test "$MIRROR" = "huaweicloud" && pip3 config set global.index-url https://repo.huaweicloud.com/pypi/simple/
+  ;;
 esac
 
-
 # pip3 install meson
 apk add meson
-
-

sapi/quickstart/linux/run-alpine-container.sh

@@ -21,4 +21,4 @@ cd ${__DIR__}
 IMAGE=alpine:3.18
 
 cd ${__DIR__}
-docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work $IMAGE tail -f /dev/null
+docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

sapi/quickstart/linux/run-debian-container.sh

@@ -22,4 +22,4 @@ IMAGE=debian:11
 IMAGE=debian:12
 
 cd ${__DIR__}
-docker run --rm --name swoole-cli-debian-dev -d -v ${__PROJECT__}:/work -w /work $IMAGE tail -f /dev/null
+docker run --rm --name swoole-cli-debian-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

sapi/src/Preprocessor.php

@@ -155,17 +155,6 @@ public function getBaseImageTag(): string
             return 'base' . '-' . $arch;
         }
     }
-
-    public function getBaseImageDockerFile(): string
-    {
-        $arch = $this->getSystemArch();
-        if ($arch == 'x64') {
-            return 'Dockerfile';
-        } else {
-            return 'Dockerfile' . '-' . $arch;
-        }
-    }
-
     public function setPhpSrcDir(string $phpSrcDir)
     {
         $this->phpSrcDir = $phpSrcDir;

sapi/src/template/make.php

@@ -290,7 +290,7 @@
 }
 
 help() {
-    echo "./make.sh docker-build [china|ustc|tuna]"
+    echo "./make.sh docker-build [ china | ustc | tuna ]"
     echo "./make.sh docker-bash"
     echo "./make.sh docker-commit"
     echo "./make.sh docker-push"
@@ -320,8 +320,18 @@
     if [ -n "$2" ]; then
         MIRROR=$2
     fi
+    PLATFORM=''
+    ARCH=$(uname -m)
+    case $ARCH in
+    'x86_64')
+      PLATFORM='linux/amd64'
+      ;;
+    'aarch64')
+      PLATFORM='linux/arm64'
+      ;;
+    esac
     cd ${__PROJECT_DIR__}/sapi/docker
-    docker build -t <?= Preprocessor::IMAGE_NAME ?>:<?= $this->getBaseImageTag() ?> -f <?= $this->getBaseImageDockerFile() ?>  . --build-arg="MIRROR=${MIRROR}"
+    docker build --no-cache -t <?= Preprocessor::IMAGE_NAME ?>:<?= $this->getBaseImageTag() ?> -f Dockerfile  . --build-arg="MIRROR=${MIRROR}" --progress=plain  --platform=${PLATFORM}
     exit 0
 elif [ "$1" = "docker-bash" ] ;then
     container=$(docker ps -a -f name=<?= Preprocessor::CONTAINER_NAME ?> | tail -n +2 2> /dev/null)