chore(docker): remove imagemagick and contrib edits

ronisaha · Dec 1, 2024 · a164274 · a164274
1 parent a371f83
commit a164274
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 21 deletions.
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -11,7 +11,6 @@ RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf
 #install exetentions and dependencies
 RUN set -eux; \
 	\
-	sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list; \
 	apt-get update && apt-get -y upgrade; \
 	apt-get install -y libaio1 wget unzip \
 		libicu-dev \
@@ -21,7 +20,6 @@ RUN set -eux; \
         libmagickwand-dev \
         librabbitmq-dev \
         libpq-dev  \
-        imagemagick \
         libxslt1-dev \
         \
         libjpeg62-turbo \
@@ -53,7 +51,7 @@ RUN set -eux; \
 	curl -L https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions > /usr/local/bin/install-php-extensions \
   ; \
   chmod +x /usr/local/bin/install-php-extensions ; \
-  install-php-extensions gd Imagick/imagick@master amqp; \
+  install-php-extensions gd amqp; \
   rm -f /usr/local/bin/install-php-extensions; \
 	\
 	docker-php-source delete ;\

diff --git a/cli/Dockerfile b/cli/Dockerfile
@@ -9,7 +9,6 @@ ENV NODE_MAJOR=20
 #install Exetentions and dependencies
 RUN set -eux; \
 	\
-	sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list; \
 	apt-get update && apt-get -y upgrade; \
     apt-get install -y ca-certificates curl gnupg; \
     mkdir -p /etc/apt/keyrings; \
@@ -25,7 +24,6 @@ RUN set -eux; \
         libmagickwand-dev \
         librabbitmq-dev \
         libpq-dev  \
-        imagemagick \
         libxslt1-dev \
         \
         libjpeg62-turbo \
@@ -60,7 +58,7 @@ RUN set -eux; \
 	curl -L https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions > /usr/local/bin/install-php-extensions \
     ; \
   chmod +x /usr/local/bin/install-php-extensions ; \
-  install-php-extensions gd Imagick/imagick@master amqp; \
+  install-php-extensions gd amqp; \
   rm -f /usr/local/bin/install-php-extensions; \
 	\
 	docker-php-source delete ;\

diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -11,7 +11,6 @@ RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf
 #install exetentions and dependencies
 RUN set -eux; \
 	\
-	sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list; \
 	apt-get update && apt-get -y upgrade; \
 	apt-get install -y libaio1 wget unzip \
 		libicu-dev \
@@ -21,7 +20,6 @@ RUN set -eux; \
         libmagickwand-dev \
         librabbitmq-dev \
         libpq-dev  \
-        imagemagick \
         libxslt1-dev \
         \
         libjpeg62-turbo \
@@ -56,7 +54,7 @@ RUN set -eux; \
   ; \
   chmod +x /usr/local/bin/install-php-extensions ; \
 	\
-    install-php-extensions gd Imagick/imagick@master amqp; \
+    install-php-extensions gd amqp; \
       rm -f /usr/local/bin/install-php-extensions; \
 	docker-php-source delete ;\
 	apt-get remove -y g++ wget ;\

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -8,7 +8,6 @@ ENV LD_LIBRARY_PATH=/usr/lib/instantclient
 #install Exetentions and dependencies
 RUN set -eux; \
 	\
-	sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list; \
 	apt-get update && apt-get -y upgrade; \
 	apt-get install -y libaio1 wget unzip \
 		libicu-dev \
@@ -18,7 +17,6 @@ RUN set -eux; \
         libmagickwand-dev \
         librabbitmq-dev\
         libpq-dev  \
-        imagemagick \
         libxslt1-dev \
         \
         libjpeg62-turbo \
@@ -50,7 +48,7 @@ RUN set -eux; \
   	curl -L https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions > /usr/local/bin/install-php-extensions \
     ; \
     chmod +x /usr/local/bin/install-php-extensions ; \
-    install-php-extensions gd Imagick/imagick@master amqp; \
+    install-php-extensions gd amqp; \
     rm -f /usr/local/bin/install-php-extensions; \
   	\
   	docker-php-source delete ;\

diff --git a/oci/Dockerfile b/oci/Dockerfile
@@ -8,7 +8,6 @@ ENV LD_LIBRARY_PATH=/usr/lib/instantclient
 #install Exetentions and dependencies
 RUN set -eux; \
 	\
-	sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list; \
 	apt-get update && apt-get -y upgrade; \
 	apt-get install -y libaio1 wget unzip \
 		libicu-dev \
@@ -18,7 +17,6 @@ RUN set -eux; \
         libmagickwand-dev \
         librabbitmq-dev \
         libpq-dev  \
-        imagemagick \
         libxslt1-dev \
         libjpeg62-turbo \
         libpng16-16 \
@@ -64,7 +62,7 @@ RUN set -eux; \
 	curl -L https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions > /usr/local/bin/install-php-extensions \
         ; \
   chmod +x /usr/local/bin/install-php-extensions ; \
-  install-php-extensions gd Imagick/imagick@master amqp; \
+  install-php-extensions gd amqp; \
   rm -f /usr/local/bin/install-php-extensions; \
 	\
 	docker-php-source delete ;\

diff --git a/supervisor-oci/Dockerfile b/supervisor-oci/Dockerfile
@@ -8,7 +8,6 @@ ENV LD_LIBRARY_PATH=/usr/lib/instantclient
 #install Exetentions and dependencies
 RUN set -eux; \
 	\
-	sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list; \
 	apt-get update && apt-get -y upgrade; \
 	apt-get install -y libaio1 wget unzip supervisor \
 		libicu-dev \
@@ -18,7 +17,6 @@ RUN set -eux; \
         libmagickwand-dev \
         librabbitmq-dev \
         libpq-dev  \
-        imagemagick \
         libxslt1-dev \
         libjpeg62-turbo \
         libpng16-16 \
@@ -64,7 +62,7 @@ RUN set -eux; \
 	curl -L https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions > /usr/local/bin/install-php-extensions \
         ; \
   chmod +x /usr/local/bin/install-php-extensions ; \
-  install-php-extensions gd Imagick/imagick@master amqp; \
+  install-php-extensions gd amqp; \
   rm -f /usr/local/bin/install-php-extensions; \
 	\
 	docker-php-source delete ;\

diff --git a/supervisor/Dockerfile b/supervisor/Dockerfile
@@ -8,7 +8,6 @@ ENV LD_LIBRARY_PATH=/usr/lib/instantclient
 #install Exetentions and dependencies
 RUN set -eux; \
 	\
-	sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list; \
 	apt-get update && apt-get -y upgrade; \
 	apt-get install -y libaio1 wget unzip supervisor \
 		libicu-dev \
@@ -18,7 +17,6 @@ RUN set -eux; \
         libmagickwand-dev \
         librabbitmq-dev \
         libpq-dev  \
-        imagemagick \
         libxslt1-dev \
         \
         libjpeg62-turbo \
@@ -50,7 +48,7 @@ RUN set -eux; \
     curl -L https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions > /usr/local/bin/install-php-extensions \
     ; \
     chmod +x /usr/local/bin/install-php-extensions ; \
-    install-php-extensions gd Imagick/imagick@master amqp; \
+    install-php-extensions gd amqp; \
     rm -f /usr/local/bin/install-php-extensions; \
     \
     docker-php-source delete ;\