php repo migration. f_ck to ondrej

no xenophobia!
EpicMorg · Jul 29, 2024 · 3dd46a6 · 3dd46a6
1 parent ea7f728
commit 3dd46a6
Show file tree

Hide file tree

Showing 32 changed files with 122 additions and 152 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,29 @@
 # Changelog
 ## 2024
 * `july`
+  * Start migration from `Odrey's` repos due to author's rot.
+  	* [@oerdnj](https://github.com/oerdnj) go to hell, [xenophobe](https://github.com/oerdnj/deb.sury.org/issues/2155)! :fu:
+	```
+	You say that "I do understand the difference between a government and its people." and contradict yourself ("you are part of the problem") by equating people and the government.
+
+	You are a coward and a xenophobe, who by your actions do NOTHING affect the resolution of the conflict, but only incite hatred and xenophobia.
+
+	The IT community outside of government should not play geopolitics. If you have your own views, do it in your own backyard.
+
+	It is YOU who are part of the problem.
+
+	Disrespect for you.
+	```
   * updated support of `kaniko` to `v1.23.2-debug` version.
   * fixed build scripts for CI.
   * `BREAKING CHANGE:` reworked `slim`, `main` and `develop` images of `bookworm`:
 	* added new default path for sub-folders with custom tools such as `gosu`, `dumb-init` and etc.
-	* pattern: `/usr/local/epicmorg/<program-name>/<version>/<..some data and files..>`
+	* pattern: `/usr/local/share/epicmorg/<program-name>/<version>/<..some data and files..>`
 	* Some child images could install to this folder custom compilled products. Example: `nginx`, `php`, etc.
 	* All directories that contains binaryes (`<bin\sbin>`) will be added to `$PATH`.
 		* example:
 			```
-			/usr/local/epicmorg/
+			/usr/local/share/epicmorg/
 			|-- 7z
 			|   `-- 7z2407
 			|       |-- History.txt

diff --git a/Makefile b/Makefile
@@ -431,15 +431,16 @@ ecosystem-debian-bookworm-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk22    && pwd && make build && make deploy
 
 ecosystem-php-images:
-	cd `pwd`/linux/ecosystem/php/php7.0             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php7.1             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php7.2             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php7.3             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php7.4             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php8.0             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php8.1             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php8.2             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/php/php8.3             && pwd && make build && make deploy
+	echo "disabled temprorary"
+#	cd `pwd`/linux/ecosystem/php/php7.0             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php7.1             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php7.2             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php7.3             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php7.4             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php8.0             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php8.1             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php8.2             && pwd && make build && make deploy
+#	cd `pwd`/linux/ecosystem/php/php8.3             && pwd && make build && make deploy
 
 ecosystem-apache2-images:
 	cd `pwd`/linux/ecosystem/apache2/php7.0         && pwd && make build && make deploy

diff --git a/linux/advanced/nextcloud/pure/14/Dockerfile b/linux/advanced/nextcloud/pure/14/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/15/Dockerfile b/linux/advanced/nextcloud/pure/15/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/16/Dockerfile b/linux/advanced/nextcloud/pure/16/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/17/Dockerfile b/linux/advanced/nextcloud/pure/17/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/18/Dockerfile b/linux/advanced/nextcloud/pure/18/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/19/Dockerfile b/linux/advanced/nextcloud/pure/19/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/20/Dockerfile b/linux/advanced/nextcloud/pure/20/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/21/Dockerfile b/linux/advanced/nextcloud/pure/21/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/22/Dockerfile b/linux/advanced/nextcloud/pure/22/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/23/Dockerfile b/linux/advanced/nextcloud/pure/23/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/24/Dockerfile b/linux/advanced/nextcloud/pure/24/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/25/Dockerfile b/linux/advanced/nextcloud/pure/25/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/26/Dockerfile b/linux/advanced/nextcloud/pure/26/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/27/Dockerfile b/linux/advanced/nextcloud/pure/27/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/28/Dockerfile b/linux/advanced/nextcloud/pure/28/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/29/Dockerfile b/linux/advanced/nextcloud/pure/29/Dockerfile
@@ -49,11 +49,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb && \
-    dpkg -i /tmp/debsuryorg-archive-keyring.deb && \
-    wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
-    sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/advanced/nextcloud/pure/latest/Dockerfile b/linux/advanced/nextcloud/pure/latest/Dockerfile
@@ -48,11 +48,6 @@ RUN apt-get update -y && \
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb && \
-    dpkg -i /tmp/debsuryorg-archive-keyring.deb && \
-    wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
-    sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-
 RUN apt-get update -y &&  \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
         libsmbclient-dev \

diff --git a/linux/discontinued/ecosystem/syspass/sysPass/Dockerfile b/linux/discontinued/ecosystem/syspass/sysPass/Dockerfile
@@ -92,8 +92,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
 ##################################################################
 #                  installing php repo + smbclient
 ##################################################################
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 RUN apt-get update -y &&  apt-get install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev
 RUN pecl install smbclient
 RUN docker-php-ext-enable smbclient