From 5af3d0d0c854d517602300633206f9b3f26dcff1 Mon Sep 17 00:00:00 2001 From: Tom Harper Date: Tue, 19 Sep 2023 12:22:48 +0100 Subject: [PATCH] Parameterise install_dependencies script so we can specify different packages per image --- php-71/DockerFile | 2 +- php-72/DockerFile | 2 +- php-73/DockerFile | 2 +- php-74/DockerFile | 2 +- php-80/DockerFile | 2 +- php-81/DockerFile | 2 +- php-82/DockerFile | 2 +- resources/scripts/php/install_dependencies.sh | 10 +--------- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/php-71/DockerFile b/php-71/DockerFile index d965faf..c60194c 100644 --- 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 index 3ec95ea..ada368b 100644 --- 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 index d12a057..8c56c58 100644 --- 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 index e186ffe..37a1aaa 100644 --- 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 index 6f4a2ec..39b3c3f 100644 --- 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 index a5e2953..a2665bb 100644 --- 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 index d0fc693..2bb0ae7 100644 --- 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 index 656b77a..18089e2 100755 --- 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/*