fix bugs

chinayin-docker · Aug 30, 2024 · ad193c7 · ad193c7
1 parent 41a3b39
commit ad193c7
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 19 deletions.
diff --git a/7.4/slim/cli/Dockerfile b/7.4/slim/cli/Dockerfile
@@ -64,10 +64,9 @@ RUN set -eux \
   && ( \
     curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
   ) \
-  ## git \
+  ## git
   && ( \
     install_packages git \
-    && git --version \
   ) \
   ## Clean up
   && ( \
@@ -76,5 +75,9 @@ RUN set -eux \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -f /var/log/lastlog /var/log/faillog \
   ) \
-  ## Check PHP version
-  && php -v
+  ## Check version
+  && ( \
+    php -v \
+    && composer -V \
+    && git --version \
+  )
diff --git a/7.4/slim/fpm/Dockerfile b/7.4/slim/fpm/Dockerfile
@@ -67,7 +67,6 @@ RUN set -eux \
   ## git \
   && ( \
     install_packages git \
-    && git --version \
   ) \
   ## Clean up
   && ( \
@@ -76,5 +75,9 @@ RUN set -eux \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -f /var/log/lastlog /var/log/faillog \
   ) \
-  ## Check PHP version
-  && php -v
+  ## Check version
+  && ( \
+    php -v \
+    && composer -V \
+    && git --version \
+  )
diff --git a/8.2/slim/cli/Dockerfile b/8.2/slim/cli/Dockerfile
@@ -67,7 +67,6 @@ RUN set -eux \
   ## git \
   && ( \
     install_packages git \
-    && git --version \
   ) \
   ## Clean up
   && ( \
@@ -76,5 +75,9 @@ RUN set -eux \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -f /var/log/lastlog /var/log/faillog \
   ) \
-  ## Check PHP version
-  && php -v
+  ## Check version
+  && ( \
+    php -v \
+    && composer -V \
+    && git --version \
+  )
diff --git a/8.2/slim/fpm/Dockerfile b/8.2/slim/fpm/Dockerfile
@@ -67,7 +67,6 @@ RUN set -eux \
   ## git \
   && ( \
     install_packages git \
-    && git --version \
   ) \
   ## Clean up
   && ( \
@@ -76,5 +75,9 @@ RUN set -eux \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -f /var/log/lastlog /var/log/faillog \
   ) \
-  ## Check PHP version
-  && php -v
+  ## Check version
+  && ( \
+    php -v \
+    && composer -V \
+    && git --version \
+  )
diff --git a/8.3/slim/cli/Dockerfile b/8.3/slim/cli/Dockerfile
@@ -67,7 +67,6 @@ RUN set -eux \
   ## git \
   && ( \
     install_packages git \
-    && git --version \
   ) \
   ## Clean up
   && ( \
@@ -76,5 +75,9 @@ RUN set -eux \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -f /var/log/lastlog /var/log/faillog \
   ) \
-  ## Check PHP version
-  && php -v
+  ## Check version
+  && ( \
+    php -v \
+    && composer -V \
+    && git --version \
+  )
diff --git a/8.3/slim/fpm/Dockerfile b/8.3/slim/fpm/Dockerfile
@@ -67,7 +67,6 @@ RUN set -eux \
   ## git \
   && ( \
     install_packages git \
-    && git --version \
   ) \
   ## Clean up
   && ( \
@@ -76,5 +75,9 @@ RUN set -eux \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -f /var/log/lastlog /var/log/faillog \
   ) \
-  ## Check PHP version
-  && php -v
+  ## Check version
+  && ( \
+    php -v \
+    && composer -V \
+    && git --version \
+  )