Merge branch 'master' into merge-onatal-deps

Author: joostfaassen

Dockerfile.php7

@@ -50,7 +50,10 @@ RUN mkdir -p /etc/apt/keyrings \
   | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
   && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
-  && apt-get install nodejs -y
+  && apt-get install nodejs -y \
+  && apt-get autoremove \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg \
     | gpg --dearmor >> /usr/share/keyrings/yarnkey.gpg \
@@ -62,7 +65,7 @@ RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg \
   && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-install bz2 \
-  && install-php-extensions apcu gd gmp intl opcache pdo_mysql pdo_pgsql sockets zip imap mailparse soap mysqli bcmath soap \
+  && install-php-extensions apcu gd gmp intl opcache pdo_mysql pdo_pgsql sockets zip imap mailparse soap mysqli bcmath \
   && apt-get autoremove \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*

Dockerfile.php8

@@ -50,7 +50,10 @@ RUN mkdir -p /etc/apt/keyrings \
   | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
   && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
-  && apt-get install nodejs -y
+  && apt-get install nodejs -y \
+  && apt-get autoremove \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg \
     | gpg --dearmor >> /usr/share/keyrings/yarnkey.gpg \
@@ -62,7 +65,7 @@ RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg \
   && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-install bz2 \
-  && install-php-extensions apcu gd gmp intl opcache pdo_mysql pdo_pgsql sockets zip imap mailparse soap mysqli bcmath soap \
+  && install-php-extensions apcu gd gmp intl opcache pdo_mysql pdo_pgsql sockets zip imap mailparse soap mysqli bcmath \
   && apt-get autoremove \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*