Parameterise install_dependencies script so we can specify different …

…packages per image
Rareloop · Sep 19, 2023 · 5af3d0d · 5af3d0d
1 parent 5f2f30f
commit 5af3d0d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 16 deletions.
diff --git a/php-71/DockerFile b/php-71/DockerFile
@@ -19,7 +19,7 @@ COPY /resources/config/php/ /docker-config/
 COPY /resources/scripts/php/install_* /docker-scripts/
 
 # Run Installation Scripts
-RUN /docker-scripts/install_dependencies.sh
+RUN /docker-scripts/install_dependencies.sh sudo vim nano netcat git iputils-ping dnsutils default-mysql-client
 RUN /docker-scripts/install_extensions.sh
 RUN /docker-scripts/install_users.sh
 RUN /docker-scripts/install_config.sh

diff --git a/php-72/DockerFile b/php-72/DockerFile
@@ -19,7 +19,7 @@ COPY /resources/config/php/ /docker-config/
 COPY /resources/scripts/php/install_* /docker-scripts/
 
 # Run Installation Scripts
-RUN /docker-scripts/install_dependencies.sh
+RUN /docker-scripts/install_dependencies.sh sudo vim nano netcat git iputils-ping dnsutils default-mysql-client
 RUN /docker-scripts/install_extensions.sh
 RUN /docker-scripts/install_users.sh
 RUN /docker-scripts/install_config.sh

diff --git a/php-73/DockerFile b/php-73/DockerFile
@@ -19,7 +19,7 @@ COPY /resources/config/php/ /docker-config/
 COPY /resources/scripts/php/install_* /docker-scripts/
 
 # Run Installation Scripts
-RUN /docker-scripts/install_dependencies.sh
+RUN /docker-scripts/install_dependencies.sh sudo vim nano netcat git iputils-ping dnsutils default-mysql-client
 RUN /docker-scripts/install_extensions.sh
 RUN /docker-scripts/install_users.sh
 RUN /docker-scripts/install_config.sh

diff --git a/php-74/DockerFile b/php-74/DockerFile
@@ -19,7 +19,7 @@ COPY /resources/config/php/ /docker-config/
 COPY /resources/scripts/php/install_* /docker-scripts/
 
 # Run Installation Scripts
-RUN /docker-scripts/install_dependencies.sh
+RUN /docker-scripts/install_dependencies.sh sudo vim nano netcat git iputils-ping dnsutils default-mysql-client
 RUN /docker-scripts/install_extensions.sh
 RUN /docker-scripts/install_users.sh
 RUN /docker-scripts/install_config.sh

diff --git a/php-80/DockerFile b/php-80/DockerFile
@@ -19,7 +19,7 @@ COPY /resources/config/php/ /docker-config/
 COPY /resources/scripts/php/install_* /docker-scripts/
 
 # Run Installation Scripts
-RUN /docker-scripts/install_dependencies.sh
+RUN /docker-scripts/install_dependencies.sh sudo vim nano netcat git iputils-ping dnsutils default-mysql-client
 RUN /docker-scripts/install_extensions.sh
 RUN /docker-scripts/install_users.sh
 RUN /docker-scripts/install_config.sh

diff --git a/php-81/DockerFile b/php-81/DockerFile
@@ -19,7 +19,7 @@ COPY /resources/config/php/ /docker-config/
 COPY /resources/scripts/php/install_* /docker-scripts/
 
 # Run Installation Scripts
-RUN /docker-scripts/install_dependencies.sh
+RUN /docker-scripts/install_dependencies.sh sudo vim nano netcat-traditional git iputils-ping dnsutils default-mysql-client
 RUN /docker-scripts/install_extensions.sh
 RUN /docker-scripts/install_users.sh
 RUN /docker-scripts/install_config.sh

diff --git a/php-82/DockerFile b/php-82/DockerFile
@@ -19,7 +19,7 @@ COPY /resources/config/php/ /docker-config/
 COPY /resources/scripts/php/install_* /docker-scripts/
 
 # Run Installation Scripts
-RUN /docker-scripts/install_dependencies.sh
+RUN /docker-scripts/install_dependencies.sh sudo vim nano netcat-traditional git iputils-ping dnsutils default-mysql-client
 RUN /docker-scripts/install_extensions.sh
 RUN /docker-scripts/install_users.sh
 RUN /docker-scripts/install_config.sh

diff --git a/resources/scripts/php/install_dependencies.sh b/resources/scripts/php/install_dependencies.sh
@@ -7,15 +7,7 @@ curl -sSLf \
     chmod +x /usr/local/bin/install-php-extensions
 
 # Install Sudo
-apt-get update && apt-get install -y \
-    sudo \
-    vim \
-    nano \
-    netcat-traditional \
-    git \
-    iputils-ping \
-    dnsutils \
-    default-mysql-client
+apt-get update && apt-get install -y "$@"
 
 # Cleanup Apt
 apt-get clean && rm -rf /var/lib/apt/lists/*