From 032776f575ee33e1c9e71677be97176497280421 Mon Sep 17 00:00:00 2001
From: "Shao Yu-Lung (Allen)" <bestlong168@gmail.com>
Date: Wed, 7 Apr 2021 23:19:18 +0800
Subject: [PATCH 1/3] ci update .env step 1 set all true

---
 .github/workflows/main-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
index 026c3f25..fd2f6c79 100644
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -24,9 +24,8 @@ jobs:
       run: |
         set -eux
         cp env-example .env
-        sed -i -- '99,313s/=false/=true/g' .env
+        sed -i -- 's/=false/=true/g' .env
         sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
-        sed -i -- 's/GNUPG=false/GNUPG=true/g' .env
         sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
         sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env
         sed -i -- 's/GEARMAN=true/GEARMAN=false/g' .env

From f196023a03a826d0480f774e291534ef85a90e59 Mon Sep 17 00:00:00 2001
From: "Shao Yu-Lung (Allen)" <bestlong168@gmail.com>
Date: Wed, 7 Apr 2021 23:21:47 +0800
Subject: [PATCH 2/3] adjust step order

---
 laravel-horizon/Dockerfile | 15 +++++++--------
 php-worker/Dockerfile      | 13 +++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile
index 487366a5..142f4b87 100644
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -92,13 +92,6 @@ RUN if [ ${INSTALL_GD} = true ]; then \
    docker-php-ext-install gd \
 ;fi
 
-#Install GMP package:
-ARG INSTALL_GMP=false
-RUN if [ ${INSTALL_GMP} = true ]; then \
-   apk add --update --no-cache gmp gmp-dev; \
-   docker-php-ext-install gmp \
-;fi
-
 #Install ImageMagick package:
 ARG INSTALL_IMAGEMAGICK=false
 ARG IMAGEMAGICK_VERSION=latest
@@ -107,7 +100,6 @@ RUN set -eux; \
   if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
     apk add --update --no-cache imagemagick-dev; \
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
-      apk add --update --no-cache git && \
       cd /tmp && \
       if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
         git clone https://github.com/Imagick/imagick; \
@@ -127,6 +119,13 @@ RUN set -eux; \
     php -m | grep -q 'imagick'; \
   fi
 
+#Install GMP package:
+ARG INSTALL_GMP=false
+RUN if [ ${INSTALL_GMP} = true ]; then \
+   apk add --update --no-cache gmp gmp-dev; \
+   docker-php-ext-install gmp \
+;fi
+
 #Install BCMath package:
 ARG INSTALL_BCMATH=false
 RUN if [ ${INSTALL_BCMATH} = true ]; then \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 1514c37d..de633af6 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -36,6 +36,7 @@ RUN apk --update add wget \
   libressl-dev \
   supervisor
 
+
 RUN pecl channel-update pecl.php.net; \
     docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl
 
@@ -125,6 +126,12 @@ RUN if [ ${INSTALL_GMP} = true ]; then \
    && docker-php-ext-install gmp \
 ;fi
 
+#Install BCMath package:
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    docker-php-ext-install bcmath \
+;fi
+
 #Install SOAP package:
 ARG INSTALL_SOAP=false
 RUN if [ ${INSTALL_SOAP} = true ]; then \
@@ -143,12 +150,6 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
       fi; \
     fi
 
-#Install BCMath package:
-ARG INSTALL_BCMATH=false
-RUN if [ ${INSTALL_BCMATH} = true ]; then \
-    docker-php-ext-install bcmath \
-;fi
-
 ###########################################################################
 # PHP OCI8:
 ###########################################################################

From 0fce9c8d38ad66684749667a642e8d03593066a6 Mon Sep 17 00:00:00 2001
From: "Shao Yu-Lung (Allen)" <bestlong168@gmail.com>
Date: Wed, 7 Apr 2021 23:33:15 +0800
Subject: [PATCH 3/3] upgrade ipython base image version

---
 ipython/Dockerfile.controller | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipython/Dockerfile.controller b/ipython/Dockerfile.controller
index d325c6f8..2993d5f8 100644
--- a/ipython/Dockerfile.controller
+++ b/ipython/Dockerfile.controller
@@ -1,4 +1,4 @@
-FROM python:3.5-alpine
+FROM python:3.8-alpine
 
 LABEL maintainer="ahkui <ahkui@outlook.com>"