From d9237ec05a10fcdc34e475fc85246284e3c949d0 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 16 Dec 2024 11:29:53 +1100 Subject: [PATCH] build: add rsync & tar to missing images --- images/mongo/4.Dockerfile | 2 ++ images/mysql/8.0.Dockerfile | 2 ++ images/mysql/8.4.Dockerfile | 2 ++ images/node-cli/18.Dockerfile | 2 -- images/node-cli/20.Dockerfile | 2 -- images/node-cli/22.Dockerfile | 2 -- images/node/18.Dockerfile | 4 ++++ images/node/20.Dockerfile | 4 ++++ images/node/22.Dockerfile | 4 ++++ images/php-cli/8.1.Dockerfile | 1 - images/php-cli/8.2.Dockerfile | 1 - images/php-cli/8.3.Dockerfile | 1 - images/php-fpm/8.1.Dockerfile | 2 ++ images/php-fpm/8.2.Dockerfile | 2 ++ images/php-fpm/8.3.Dockerfile | 2 ++ images/rabbitmq/Dockerfile | 4 ++++ images/redis/6.Dockerfile | 4 ++++ images/redis/7.Dockerfile | 4 ++++ images/solr/9.Dockerfile | 2 ++ images/valkey/8.Dockerfile | 4 ++++ 20 files changed, 42 insertions(+), 9 deletions(-) diff --git a/images/mongo/4.Dockerfile b/images/mongo/4.Dockerfile index 58d1fa5b5..ea515a1fc 100644 --- a/images/mongo/4.Dockerfile +++ b/images/mongo/4.Dockerfile @@ -33,6 +33,8 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.9/community' >> /etc/apk/repos RUN apk update \ && apk add --no-cache \ mongodb=4.0.5-r0 \ + rsync \ + tar \ && rm -rf /var/cache/apk/* RUN mkdir -p /data/db /data/configdb && \ diff --git a/images/mysql/8.0.Dockerfile b/images/mysql/8.0.Dockerfile index 0f7076c9f..2864fef8e 100644 --- a/images/mysql/8.0.Dockerfile +++ b/images/mysql/8.0.Dockerfile @@ -44,6 +44,8 @@ RUN microdnf install -y epel-release \ gettext \ net-tools \ pwgen \ + rsync \ + tar \ wget; \ rm -rf /var/lib/mysql/* /etc/mysql/ /etc/my.cnf*; \ curl -sSL https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl -o mysqltuner.pl diff --git a/images/mysql/8.4.Dockerfile b/images/mysql/8.4.Dockerfile index 52859faa8..ae50cde85 100644 --- a/images/mysql/8.4.Dockerfile +++ b/images/mysql/8.4.Dockerfile @@ -43,6 +43,8 @@ RUN microdnf install -y epel-release \ gettext \ net-tools \ pwgen \ + rsync \ + tar \ wget; \ rm -rf /var/lib/mysql/* /etc/mysql/ /etc/my.cnf*; \ curl -sSL https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl -o mysqltuner.pl diff --git a/images/node-cli/18.Dockerfile b/images/node-cli/18.Dockerfile index 1746fb61a..fae551958 100644 --- a/images/node-cli/18.Dockerfile +++ b/images/node-cli/18.Dockerfile @@ -23,8 +23,6 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari patch \ postgresql-client \ procps \ - rsync \ - tar \ unzip \ && rm -rf /var/cache/apk/* \ && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \ diff --git a/images/node-cli/20.Dockerfile b/images/node-cli/20.Dockerfile index e035d368f..e62d5cf39 100644 --- a/images/node-cli/20.Dockerfile +++ b/images/node-cli/20.Dockerfile @@ -23,8 +23,6 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari patch \ postgresql-client \ procps \ - rsync \ - tar \ unzip \ && rm -rf /var/cache/apk/* \ && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \ diff --git a/images/node-cli/22.Dockerfile b/images/node-cli/22.Dockerfile index 3f021a15f..dc14ec777 100644 --- a/images/node-cli/22.Dockerfile +++ b/images/node-cli/22.Dockerfile @@ -23,8 +23,6 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari patch \ postgresql-client \ procps \ - rsync \ - tar \ unzip \ && rm -rf /var/cache/apk/* \ && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \ diff --git a/images/node/18.Dockerfile b/images/node/18.Dockerfile index bad56c3a3..adab4967a 100644 --- a/images/node/18.Dockerfile +++ b/images/node/18.Dockerfile @@ -14,6 +14,10 @@ LABEL org.opencontainers.image.base.name="docker.io/node:18-alpine3.20" ENV LAGOON=node +RUN apk add --no-cache \ + rsync \ + tar + # Copy commons files COPY --from=commons /lagoon /lagoon COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ diff --git a/images/node/20.Dockerfile b/images/node/20.Dockerfile index 2df8cbcfa..d26e74d28 100644 --- a/images/node/20.Dockerfile +++ b/images/node/20.Dockerfile @@ -14,6 +14,10 @@ LABEL org.opencontainers.image.base.name="docker.io/node:20-alpine3.20" ENV LAGOON=node +RUN apk add --no-cache \ + rsync \ + tar + # Copy commons files COPY --from=commons /lagoon /lagoon COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ diff --git a/images/node/22.Dockerfile b/images/node/22.Dockerfile index 9cd95e1e4..583602301 100644 --- a/images/node/22.Dockerfile +++ b/images/node/22.Dockerfile @@ -14,6 +14,10 @@ LABEL org.opencontainers.image.base.name="docker.io/node:22-alpine3.20" ENV LAGOON=node +RUN apk add --no-cache \ + rsync \ + tar + # Copy commons files COPY --from=commons /lagoon /lagoon COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile index 21f8d8a59..4efab4d2c 100644 --- a/images/php-cli/8.1.Dockerfile +++ b/images/php-cli/8.1.Dockerfile @@ -29,7 +29,6 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari patch \ postgresql-client \ procps \ - rsync \ unzip \ yarn \ && rm -rf /var/cache/apk/* \ diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile index b8a14347b..dcdf56e07 100644 --- a/images/php-cli/8.2.Dockerfile +++ b/images/php-cli/8.2.Dockerfile @@ -29,7 +29,6 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari patch \ postgresql-client \ procps \ - rsync \ unzip \ yarn \ && rm -rf /var/cache/apk/* \ diff --git a/images/php-cli/8.3.Dockerfile b/images/php-cli/8.3.Dockerfile index 99d38d49e..3afd4ab56 100644 --- a/images/php-cli/8.3.Dockerfile +++ b/images/php-cli/8.3.Dockerfile @@ -29,7 +29,6 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari patch \ postgresql-client \ procps \ - rsync \ unzip \ yarn \ && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \ diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile index 34b66196a..3a35d2457 100644 --- a/images/php-fpm/8.1.Dockerfile +++ b/images/php-fpm/8.1.Dockerfile @@ -115,7 +115,9 @@ RUN apk update \ libxslt \ libzip \ postgresql-libs \ + rsync \ ssmtp \ + tar \ tidyhtml \ unzip \ yaml \ diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile index e6600f7f0..cc565fa61 100644 --- a/images/php-fpm/8.2.Dockerfile +++ b/images/php-fpm/8.2.Dockerfile @@ -115,7 +115,9 @@ RUN apk update \ libxslt \ libzip \ postgresql-libs \ + rsync \ ssmtp \ + tar \ tidyhtml \ unzip \ yaml \ diff --git a/images/php-fpm/8.3.Dockerfile b/images/php-fpm/8.3.Dockerfile index 607352656..cefebbe35 100644 --- a/images/php-fpm/8.3.Dockerfile +++ b/images/php-fpm/8.3.Dockerfile @@ -115,7 +115,9 @@ RUN apk update \ libxslt \ libzip \ postgresql-libs \ + rsync \ ssmtp \ + tar \ tidyhtml \ unzip \ yaml \ diff --git a/images/rabbitmq/Dockerfile b/images/rabbitmq/Dockerfile index 02f935e76..7550bed2b 100644 --- a/images/rabbitmq/Dockerfile +++ b/images/rabbitmq/Dockerfile @@ -14,6 +14,10 @@ LABEL org.opencontainers.image.base.name="docker.io/rabbitmq:3-management-alpine ENV LAGOON=rabbitmq +RUN apk add --no-cache \ + rsync \ + tar + ENV RABBITMQ_DEFAULT_USER='guest' \ RABBITMQ_DEFAULT_PASS='guest'\ RABBITMQ_DEFAULT_HA_PATTERN='^$'\ diff --git a/images/redis/6.Dockerfile b/images/redis/6.Dockerfile index f53ed5096..4361db62b 100644 --- a/images/redis/6.Dockerfile +++ b/images/redis/6.Dockerfile @@ -16,6 +16,10 @@ ENV LAGOON=redis ENV FLAVOR=ephemeral +RUN apk add --no-cache \ + rsync \ + tar + # Copy commons files COPY --from=commons /lagoon /lagoon COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ diff --git a/images/redis/7.Dockerfile b/images/redis/7.Dockerfile index ba4ced79b..f7eca7d55 100644 --- a/images/redis/7.Dockerfile +++ b/images/redis/7.Dockerfile @@ -16,6 +16,10 @@ ENV LAGOON=redis ENV FLAVOR=ephemeral +RUN apk add --no-cache \ + rsync \ + tar + # Copy commons files COPY --from=commons /lagoon /lagoon COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ diff --git a/images/solr/9.Dockerfile b/images/solr/9.Dockerfile index dd765e638..e8199e8fe 100755 --- a/images/solr/9.Dockerfile +++ b/images/solr/9.Dockerfile @@ -37,6 +37,8 @@ RUN apt-get -y update \ && apt-get -y install \ busybox \ curl \ + rsync \ + tar \ zip \ && rm -rf /var/lib/apt/lists/* diff --git a/images/valkey/8.Dockerfile b/images/valkey/8.Dockerfile index e183e5c91..9d617478f 100644 --- a/images/valkey/8.Dockerfile +++ b/images/valkey/8.Dockerfile @@ -17,6 +17,10 @@ ENV LAGOON=valkey ENV FLAVOR=ephemeral +RUN apk add --no-cache \ + rsync \ + tar + # Copy commons files COPY --from=commons /lagoon /lagoon COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/