From 5109705251762182929094d8057d886b09cac558 Mon Sep 17 00:00:00 2001 From: Maxime Helias Date: Sat, 30 Mar 2024 07:23:39 +0100 Subject: [PATCH] Switch dockerfile instruction to Debian (#1303) --- doctrine/doctrine-bundle/1.12/manifest.json | 5 +---- doctrine/doctrine-bundle/1.6/manifest.json | 5 +---- doctrine/doctrine-bundle/2.0/manifest.json | 5 +---- doctrine/doctrine-bundle/2.3/manifest.json | 5 +---- doctrine/doctrine-bundle/2.4/manifest.json | 5 +---- doctrine/doctrine-bundle/2.8/manifest.json | 5 +---- symfony/panther/1.0/manifest.json | 12 ++++++------ 7 files changed, 12 insertions(+), 30 deletions(-) diff --git a/doctrine/doctrine-bundle/1.12/manifest.json b/doctrine/doctrine-bundle/1.12/manifest.json index 2d3a40ab..b39e0abb 100644 --- a/doctrine/doctrine-bundle/1.12/manifest.json +++ b/doctrine/doctrine-bundle/1.12/manifest.json @@ -15,10 +15,7 @@ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/db_name?serverVersion=16&charset=utf8" }, "dockerfile": [ - "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\", - "\tdocker-php-ext-install -j$(nproc) pdo_pgsql && \\", - "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5 && \\", - "\tapk del .pgsql-deps" + "RUN install-php-extensions pdo_pgsql" ], "docker-compose": { "docker-compose.yml": { diff --git a/doctrine/doctrine-bundle/1.6/manifest.json b/doctrine/doctrine-bundle/1.6/manifest.json index 04da3d11..254981df 100644 --- a/doctrine/doctrine-bundle/1.6/manifest.json +++ b/doctrine/doctrine-bundle/1.6/manifest.json @@ -15,10 +15,7 @@ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" }, "dockerfile": [ - "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\", - "\tdocker-php-ext-install -j$(nproc) pdo_pgsql && \\", - "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5 && \\", - "\tapk del .pgsql-deps" + "RUN install-php-extensions pdo_pgsql" ], "docker-compose": { "docker-compose.yml": { diff --git a/doctrine/doctrine-bundle/2.0/manifest.json b/doctrine/doctrine-bundle/2.0/manifest.json index 04da3d11..254981df 100644 --- a/doctrine/doctrine-bundle/2.0/manifest.json +++ b/doctrine/doctrine-bundle/2.0/manifest.json @@ -15,10 +15,7 @@ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" }, "dockerfile": [ - "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\", - "\tdocker-php-ext-install -j$(nproc) pdo_pgsql && \\", - "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5 && \\", - "\tapk del .pgsql-deps" + "RUN install-php-extensions pdo_pgsql" ], "docker-compose": { "docker-compose.yml": { diff --git a/doctrine/doctrine-bundle/2.3/manifest.json b/doctrine/doctrine-bundle/2.3/manifest.json index 26e52b92..7203651d 100644 --- a/doctrine/doctrine-bundle/2.3/manifest.json +++ b/doctrine/doctrine-bundle/2.3/manifest.json @@ -15,10 +15,7 @@ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" }, "dockerfile": [ - "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\", - "\tdocker-php-ext-install -j$(nproc) pdo_pgsql; \\", - "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5; \\", - "\tapk del .pgsql-deps" + "RUN install-php-extensions pdo_pgsql" ], "docker-compose": { "docker-compose.yml": { diff --git a/doctrine/doctrine-bundle/2.4/manifest.json b/doctrine/doctrine-bundle/2.4/manifest.json index 88bac7a0..c022d2ff 100644 --- a/doctrine/doctrine-bundle/2.4/manifest.json +++ b/doctrine/doctrine-bundle/2.4/manifest.json @@ -15,10 +15,7 @@ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" }, "dockerfile": [ - "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\", - "\tdocker-php-ext-install -j$(nproc) pdo_pgsql; \\", - "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5; \\", - "\tapk del .pgsql-deps" + "RUN install-php-extensions pdo_pgsql" ], "docker-compose": { "docker-compose.yml": { diff --git a/doctrine/doctrine-bundle/2.8/manifest.json b/doctrine/doctrine-bundle/2.8/manifest.json index addfd203..1d8996a7 100644 --- a/doctrine/doctrine-bundle/2.8/manifest.json +++ b/doctrine/doctrine-bundle/2.8/manifest.json @@ -16,10 +16,7 @@ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" }, "dockerfile": [ - "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\", - "\tdocker-php-ext-install -j\"$(nproc)\" pdo_pgsql; \\", - "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5; \\", - "\tapk del .pgsql-deps" + "RUN install-php-extensions pdo_pgsql" ], "docker-compose": { "docker-compose.yml": { diff --git a/symfony/panther/1.0/manifest.json b/symfony/panther/1.0/manifest.json index 4f08f8e7..c79f6be0 100644 --- a/symfony/panther/1.0/manifest.json +++ b/symfony/panther/1.0/manifest.json @@ -4,14 +4,14 @@ "ENV PANTHER_NO_SANDBOX 1", "# Not mandatory, but recommended", "ENV PANTHER_CHROME_ARGUMENTS='--disable-dev-shm-usage'", - "RUN apk add --no-cache chromium chromium-chromedriver", + "RUN apt-get install -y --no-install-recommends chromium chromium-driver", "", "# Firefox and geckodriver", - "#ARG GECKODRIVER_VERSION=0.29.0", - "#RUN apk add --no-cache firefox", - "#RUN wget -q https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz; \\", - "#\ttar -zxf geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz -C /usr/bin; \\", - "#\trm geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz" + "#ARG GECKODRIVER_VERSION=0.34.0", + "#RUN apt-get install -y --no-install-recommends firefox", + "#RUN wget -q https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-aarch64.tar.gz; \\", + "#\ttar -zxf geckodriver-v$GECKODRIVER_VERSION-aarch64.tar.gz -C /usr/bin; \\", + "#\trm geckodriver-v$GECKODRIVER_VERSION-aarch64.tar.gz" ], "add-lines": [ {