Jeremy Zheng 1 рік тому
батько
коміт
17163b3536
4 змінених файлів з 15 додано та 19 видалено
  1. 2 1
      docker/mint/README.md
  2. 5 4
      docker/mint/build.sh
  3. 8 3
      docker/mint/launch.sh
  4. 0 11
      docker/mint/start.sh

+ 2 - 1
docker/mint/README.md

@@ -1,5 +1,6 @@
 # USAGE
 
 ```bash
-./start.sh fpm
+cd ~/workspace/mint
+./docker/run.sh 8.1 fpm
 ```

+ 5 - 4
docker/mint/build.sh

@@ -9,13 +9,14 @@ if [ "$#" -ne 1 ]; then
 fi
 
 export VERSION=$(date "+%4Y%m%d%H%M%S")
-export CODE="mint-$(uname -m)-$1"
+export CODE="mint-php$1"
+export TAR="$CODE-$(uname -m)"
 
 podman pull ubuntu:latest
 podman build --build-arg PHP_VERSION=$1 -t $CODE .
-podman save --format=oci-archive -o $CODE-$VERSION.tar $CODE
-md5sum $CODE-$VERSION.tar >$CODE-$VERSION.md5
+podman save --format=oci-archive -o $TAR.tar $CODE
+md5sum $TAR.tar >$TAR.md5
 
-echo "done($CODE-$VERSION.tar)."
+echo "done($TAR.tar)."
 
 exit 0

+ 8 - 3
docker/mint/launch.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+export PHP_VERSION="8.1"
+export CODE="mint-php${PHP_VERSION}"
+
 export USAGE="USAGE: $0 MINT_VERSION TASK"
 
 if [ "$#" -ne 2 ]; then
@@ -9,10 +12,12 @@ if [ "$#" -ne 2 ]; then
     exit 2
 fi
 
-if [ "$2" == "fpm" ]; then
-    echo "start fpm server($1)"
+if [ "$2" == "fpm" || "$2" == "worker" ]; then
+    podman run --rm -it --events-backend=file --hostname=mint --network host -v $PWD:/srv:z $CODE /srv/launch.sh $2
+elif [ "$1" == "setup" ]; then
+    cd /srv/www/mint-
 elif [ "$1" == "shell" ]; then
-    echo "start $2 for $1"
+    podman run --rm -it --events-backend=file --hostname=mint --network host -v $PWD:/srv:z $CODE /bin/bash
 else
     echo $USAGE
     exit 1

+ 0 - 11
docker/mint/start.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ "$#" -ne 1 ]; then
-    echo "USAGE: $0 PHP_VERSION"
-    exit 1
-fi
-
-export CODE="mint-$(uname -m)-$1"
-
-podman run --rm -it --events-backend=file --hostname=mint --network host -v $PWD:/workspace:z $CODE