From f7162cbc793394863c771bdb6fef913b9d1c24ed Mon Sep 17 00:00:00 2001
From: crazywhalecc <jesse2061@outlook.com>
Date: Mon, 16 May 2022 15:51:11 +0800
Subject: [PATCH] fix micro error bug

---
 docker/Dockerfile       |  4 ++--
 docker/compile-micro.sh | 11 +++++++----
 docker/fast-compiler.sh |  3 +--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 10c4dd11..6092fca4 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,7 +21,7 @@ ENV ENABLE_MICRO="${COMPILE_MICRO}"
 ENV LINK_APK_REPO='mirrors.ustc.edu.cn'
 ENV LINK_APK_REPO_BAK='dl-cdn.alpinelinux.org'
 
-RUN if [ "${USE_BACKUP}" = "yes" ]; then \
+RUN if [ "${USE_BACKUP}" = "no" ]; then \
         echo "Using backup address..." && sleep 3s; \
         sed -i 's/dl-cdn.alpinelinux.org/'${LINK_APK_REPO}'/g' /etc/apk/repositories ; \
     else \
@@ -89,7 +89,7 @@ RUN ./check-extensions.sh check_before_configure > /dev/null
 
 RUN echo "Compiling PHP ..."
 RUN if [ "${ENABLE_MICRO}" = "yes" ]; then \
-        ./compile-micro.sh ${VER_PHP} ; \
+        ./compile-micro.sh ${VER_PHP} ${USE_BACKUP} ; \
     else \
         ./compile-php.sh ${VER_PHP} > /dev/null 2>&1 ; \
     fi
diff --git a/docker/compile-micro.sh b/docker/compile-micro.sh
index 423150d0..2f53c706 100755
--- a/docker/compile-micro.sh
+++ b/docker/compile-micro.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 VER_PHP="$1"
+USE_BACKUP="$2"
 
 self_dir=$(cd "$(dirname "$0")";pwd)
 php_dir=$(find $self_dir/source -name "php-$VER_PHP" -type d | tail -n1)
@@ -23,16 +24,18 @@ function php_compile_args() {
 
 php_compile_args && sleep 1s
 
+test "$USE_BACKUP" = "no" && GITHUB_ADDR="fgit.zhamao.me" || GITHUB_ADDR="github.com"
+
 cd $php_dir && \
-    git clone https://github.com/dixyes/phpmicro.git --depth=1 sapi/micro && \
+    git clone https://$GITHUB_ADDR/dixyes/phpmicro.git --depth=1 sapi/micro && \
     ./buildconf --force && \
     ./configure LDFLAGS=-static $(php_compile_args $VER_PHP) && \
     $self_dir/check-extensions.sh check_after_configure && \
     sed -ie 's/-export-dynamic//g' "Makefile" && \
     sed -ie 's/-o $(SAPI_CLI_PATH)/-all-static -o $(SAPI_CLI_PATH)/g' "Makefile" && \
     sed -ie 's/-o $(SAPI_MICRO_PATH)/-all-static -o $(SAPI_MICRO_PATH)/g' "Makefile" && \
-    sed -ie 's/$(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_MICRO_OBJS)/$(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_BINARY_OBJS:.lo=.o) $(PHP_MICRO_OBJS:.lo=.o)/g' "Makefile" && \
+    #sed -ie 's/$(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_MICRO_OBJS)/$(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_BINARY_OBJS:.lo=.o) $(PHP_MICRO_OBJS:.lo=.o)/g' "Makefile" && \
     sed -ie 's/$(EXTRA_LIBS:-lresolv=-Wl,-Bstatic,-lresolv,-Bdynamic)/$(EXTRA_LIBS)/g' "Makefile" && \
-    make micro LDFLAGS="-static" -j$(cat /proc/cpuinfo | grep processor | wc -l)
-    #make install 
+    make LDFLAGS="-ldl -static" micro -j$(cat /proc/cpuinfo | grep processor | wc -l)
+    #make install
     #strip $self_dir/php-dist/bin/php
diff --git a/docker/fast-compiler.sh b/docker/fast-compiler.sh
index 62b21bc2..05cb19b2 100755
--- a/docker/fast-compiler.sh
+++ b/docker/fast-compiler.sh
@@ -51,5 +51,4 @@ chmod +x download.sh check-extensions.sh compile-php.sh compile-micro.sh
     ./download.sh libzip ${USE_BACKUP} && \
     ./download.sh php ${USE_BACKUP} ${VER_PHP} && \
     ./check-extensions.sh check_before_configure && \
-    ./compile-micro.sh ${VER_PHP}
-
+    ./compile-php.sh ${VER_PHP}