From 3dd46a6adf5ac9142d9926b60507577f343022c3 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 29 Jul 2024 14:47:06 +0300 Subject: [PATCH] php repo migration. f_ck to ondrej no xenophobia! --- CHANGELOG.md | 17 +++- Makefile | 19 ++--- linux/advanced/nextcloud/pure/14/Dockerfile | 2 - linux/advanced/nextcloud/pure/15/Dockerfile | 2 - linux/advanced/nextcloud/pure/16/Dockerfile | 2 - linux/advanced/nextcloud/pure/17/Dockerfile | 2 - linux/advanced/nextcloud/pure/18/Dockerfile | 2 - linux/advanced/nextcloud/pure/19/Dockerfile | 2 - linux/advanced/nextcloud/pure/20/Dockerfile | 2 - linux/advanced/nextcloud/pure/21/Dockerfile | 2 - linux/advanced/nextcloud/pure/22/Dockerfile | 2 - linux/advanced/nextcloud/pure/23/Dockerfile | 2 - linux/advanced/nextcloud/pure/24/Dockerfile | 2 - linux/advanced/nextcloud/pure/25/Dockerfile | 2 - linux/advanced/nextcloud/pure/26/Dockerfile | 2 - linux/advanced/nextcloud/pure/27/Dockerfile | 2 - linux/advanced/nextcloud/pure/28/Dockerfile | 2 - linux/advanced/nextcloud/pure/29/Dockerfile | 5 -- .../advanced/nextcloud/pure/latest/Dockerfile | 5 -- .../ecosystem/syspass/sysPass/Dockerfile | 2 - .../debian/12-bookworm/develop/Dockerfile | 78 ++++++++++++------- linux/ecosystem/nginx/1.27.0/main/Dockerfile | 41 ++++++++-- .../nginx/latest/mainline/php/Dockerfile | 4 +- linux/ecosystem/php/php7.0/Dockerfile | 11 +-- linux/ecosystem/php/php7.1/Dockerfile | 11 +-- linux/ecosystem/php/php7.2/Dockerfile | 11 +-- linux/ecosystem/php/php7.3/Dockerfile | 11 +-- linux/ecosystem/php/php7.4/Dockerfile | 12 +-- linux/ecosystem/php/php8.0/Dockerfile | 4 - linux/ecosystem/php/php8.1/Dockerfile | 4 - linux/ecosystem/php/php8.2/Dockerfile | 4 - linux/ecosystem/php/php8.3/Dockerfile | 5 -- 32 files changed, 122 insertions(+), 152 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a5840cef..04261a482 100644 --- 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///<..some data and files..>` + * pattern: `/usr/local/share/epicmorg///<..some data and files..>` * Some child images could install to this folder custom compilled products. Example: `nginx`, `php`, etc. * All directories that contains binaryes (``) will be added to `$PATH`. * example: ``` - /usr/local/epicmorg/ + /usr/local/share/epicmorg/ |-- 7z | `-- 7z2407 | |-- History.txt diff --git a/Makefile b/Makefile index 868426411..fd22bd002 100644 --- 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 index 93d001947..936bae33e 100644 --- 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 index 8a5fdd715..f86f787fe 100644 --- 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 index c2e5a4eab..b7e76d227 100644 --- 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 index 475c33c33..368864281 100644 --- 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 index 7aba27689..0d7a4511a 100644 --- 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 index da4f3c6c6..5f4cd673c 100644 --- 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 index 7b44596b5..5806a16a9 100644 --- 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 index 82022afcd..4e6d6a90d 100644 --- 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 index b91838853..5fd353c4f 100644 --- 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 index 31bcc2458..8349671d4 100644 --- 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 index aae4afaf3..465d6a2b4 100644 --- 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 index 4565dd346..9ecc2ba24 100644 --- 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 index 7a1c8052b..7fde74ed1 100644 --- 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 index 3dfad91e5..fca625c89 100644 --- 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 index b6add5a73..0bb10b8f2 100644 --- 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 index b040bc88a..d5b37977d 100644 --- 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 index a71b35323..5a5f46ec6 100644 --- 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 index 8bf5e6ab3..c61e7bc86 100644 --- 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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile index f3de80cfe..35750c004 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile @@ -45,7 +45,7 @@ ENV LUAJIT2OR_DIR=${EMG_LOCAL_BASE_DIR}/luajit2/${LUAJIT2OR_VERSION} ENV LUAJIT2OR_BIN_DIR=${PCRE_DIR}/bin ENV LUAJIT2OR_LIB_DIR=${LUAJIT2OR_DIR}/lib ENV LUAJIT2OR_INC_DIR=${LUAJIT2OR_DIR}/include -ENV LUAJIT2OR_SRC_DIR=${LUAJIT2OR_DIR}/src +ENV LUAJIT2OR_SRC_DIR=/usr/src/luajit2/${LUAJIT2OR_VERSION} ARG LUAJIT2OR_DOWNLOAD_URL=https://github.com/openresty/luajit2.git ARG LUAJIT2OR_TEMP_SRC=/tmp/luajit2 @@ -54,7 +54,7 @@ ENV ZLIB_VERSION=1.3.1 ENV ZLIB_DIR=${EMG_LOCAL_BASE_DIR}/zlib/${ZLIB_VERSION} ENV ZLIB_INC_DIR=${ZLIB_DIR}/include ENV ZLIB_LIB_DIR=${ZLIB_DIR}/lib -ENV ZLIB_SRC_DIR=${ZLIB_DIR}/src +ENV ZLIB_SRC_DIR=/usr/src/zlib/${ZLIB_VERSION} ARG ZLIB_DOWNLOAD_URL=https://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} @@ -65,7 +65,7 @@ ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin ENV ZSTD_INC_DIR=${ZSTD_DIR}/include ENV ZSTD_LIB_DIR=${ZSTD_DIR}/lib -ENV ZSTD_SRC_DIR=${ZSTD_DIR}/src +ENV ZSTD_SRC_DIR=/usr/src/zstd/${ZSTD_VERSION} ARG ZSTD_DOWNLOAD_URL=https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz ARG ZSTD_TEMP=/tmp/zstd-${ZSTD_VERSION}.tar.gz ARG ZSTD_TEMP_SRC=/tmp/zstd-${ZSTD_VERSION} @@ -76,20 +76,17 @@ ENV IP2LOC_DIR=${EMG_LOCAL_BASE_DIR}/ip2location/${IP2LOC_VERSION} ENV IP2LOC_BIN_DIR=${IP2LOC_DIR}/bin ENV IP2LOC_INC_DIR=${IP2LOC_DIR}/include ENV IP2LOC_LIB_DIR=${IP2LOC_DIR}/lib -ENV IP2LOC_SRC_DIR=${IP2LOC_DIR}/src +ENV IP2LOC_SRC_DIR=/usr/src/ip2location/${IP2LOC_VERSION} ARG IP2LOC_DOWNLOAD_URL=https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/heads/master.tar.gz -#ARG IP2LOC_DOWNLOAD_URL=https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/tags/${IP2LOC_VERSION}.tar.gz ARG IP2LOC_TEMP=/tmp/master.tar.gz -#ARG IP2LOC_TEMP=/tmp/${IP2LOC_VERSION}.tar.gz ARG IP2LOC_TEMP_SRC=/tmp/IP2Location-C-Library-master -#ARG IP2LOC_TEMP_SRC=/tmp/IP2Location-C-Library-${IP2LOC_VERSION} # libatomic_ops source tarball ENV LIBATOMICOPS_VERSION=7.8.2 ENV LIBATOMICOPS_DIR=${EMG_LOCAL_BASE_DIR}/libatomic_ops/${LIBATOMICOPS_VERSION} ENV LIBATOMICOPS_INC_DIR=${LIBATOMICOPS_DIR}/include ENV LIBATOMICOPS_LIB_DIR=${LIBATOMICOPS_DIR}/lib -ENV LIBATOMICOPS_SRC_DIR=${LIBATOMICOPS_DIR}/src +ENV LIBATOMICOPS_SRC_DIR=/usr/src/libatomic_ops/${LIBATOMICOPS_VERSION} ARG LIBATOMICOPS_DOWNLOAD_URL=https://github.com/ivmai/libatomic_ops/releases/download/v${LIBATOMICOPS_VERSION}/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz ARG LIBATOMICOPS_TEMP=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz ARG LIBATOMICOPS_TEMP_SRC=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION} @@ -98,14 +95,14 @@ ARG LIBATOMICOPS_TEMP_SRC=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION} ENV LIBIMAGEQUANT_VERSION=4.3.1 ARG LIBIMAGEQUANT_DOWNLOAD_URL=https://github.com/ImageOptim/libimagequant ENV LIBIMAGEQUANT_DIR=${EMG_LOCAL_BASE_DIR}/libimagequant -ENV LIBIMAGEQUANT_SRC_DIR=${LIBIMAGEQUANT_DIR}/src +ENV LIBIMAGEQUANT_SRC_DIR=/usr/src/libimagequant/${LIBIMAGEQUANT_VERSION} ARG LIBIMAGEQUANT_TEMP_SRC=/tmp/libimagequant # libraqm source ENV LIBRAQM_VERSION=0.10.1 ARG LIBRAQM_DOWNLOAD_URL=https://github.com/HOST-Oman/libraqm ENV LIBRAQM_DIR=${EMG_LOCAL_BASE_DIR}/libraqm -ENV LIBRAQM_SRC_DIR=${LIBRAQM_DIR}/src +ENV LIBRAQM_SRC_DIR=/usr/src/libraqm/${LIBRAQM_VERSION} ARG LIBRAQM_TEMP_SRC=/tmp/libraqm # libgd source tarball @@ -114,7 +111,7 @@ ENV LIBGD_DIR=${EMG_LOCAL_BASE_DIR}/libgd/${LIBGD_VERSION} ENV LIBGD_BIN_DIR=${LIBGD_DIR}/bin ENV LIBGD_INC_DIR=${LIBGD_DIR}/include ENV LIBGD_LIB_DIR=${LIBGD_DIR}/lib -ENV LIBGD_SRC_DIR=${LIBGD_DIR}/src +ENV LIBGD_SRC_DIR=/usr/src/libgd/${LIBGD_VERSION} ARG LIBGD_DOWNLOAD_URL=https://github.com/libgd/libgd/releases/download/gd-${LIBGD_VERSION}/libgd-${LIBGD_VERSION}.tar.gz ARG LIBGD_TEMP=/tmp/libgd-${LIBGD_VERSION}.tar.gz ARG LIBGD_TEMP_SRC=/tmp/libgd-${LIBGD_VERSION} @@ -125,7 +122,7 @@ ENV LIBXML2_DIR=${EMG_LOCAL_BASE_DIR}/libxml2/${LIBXML2_VERSION} ENV LIBXML2_BIN_DIR=${LIBXML2_DIR}/bin ENV LIBXML2_INC_DIR=${LIBXML2_DIR}/include ENV LIBXML2_LIB_DIR=${LIBXML2_DIR}/lib -ENV LIBXML2_SRC_DIR=${LIBXML2_DIR}/src +ENV LIBXML2_SRC_DIR=/usr/src/libxml2/${LIBXML2_VERSION} ARG LIBXML2_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz ARG LIBXML2_TEMP=/tmp/libxml2-v${LIBXML2_VERSION}.tar.gz ARG LIBXML2_TEMP_SRC=/tmp/libxml2-v${LIBXML2_VERSION} @@ -136,7 +133,7 @@ ENV LIBXSLT_DIR=${EMG_LOCAL_BASE_DIR}/libxslt/${LIBXSLT_VERSION} ENV LIBXSLT_BIN_DIR=${LIBXSLT_DIR}/bin ENV LIBXSLT_INC_DIR=${LIBXSLT_DIR}/include ENV LIBXSLT_LIB_DIR=${LIBXSLT_DIR}/lib -ENV LIBXSLT_SRC_DIR=${LIBXSLT_DIR}/src +ENV LIBXSLT_SRC_DIR=/usr/src/libxslt/${LIBXSLT_VERSION} ARG LIBXSLT_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxslt/-/archive/v${LIBXSLT_VERSION}/libxslt-v${LIBXSLT_VERSION}.tar.gz ARG LIBXSLT_TEMP=/tmp/libxslt-v${LIBXSLT_VERSION}.tar.gz ARG LIBXSLT_TEMP_SRC=/tmp/libxslt-v${LIBXSLT_VERSION} @@ -147,7 +144,7 @@ ENV MM_GEOIP_DIR=${EMG_LOCAL_BASE_DIR}/geoip/${MM_GEOIP_VERSION} ENV MM_GEOIP_BIN_DIR=${MM_GEOIP_DIR}/bin ENV MM_GEOIP_INC_DIR=${MM_GEOIP_DIR}/include ENV MM_GEOIP_LIB_DIR=${MM_GEOIP_DIR}/lib -ENV MM_GEOIP_SRC_DIR=${MM_GEOIP_DIR}/src +ENV MM_GEOIP_SRC_DIR=/usr/src/geoip/${MM_GEOIP_VERSION} ARG MM_GEOIP_DOWNLOAD_URL=https://github.com/maxmind/geoip-api-c/releases/download/v${MM_GEOIP_VERSION}/GeoIP-${MM_GEOIP_VERSION}.tar.gz ARG MM_GEOIP_TEMP=/tmp/GeoIP-${MM_GEOIP_VERSION}.tar.gz ARG MM_GEOIP_TEMP_SRC=/tmp/GeoIP-${MM_GEOIP_VERSION} @@ -158,7 +155,7 @@ ENV GPERFTOOLS_DIR=${EMG_LOCAL_BASE_DIR}/gperftools/${GPERFTOOLS_VERSION} ENV GPERFTOOLS_BIN_DIR=${GPERFTOOLS_DIR}/bin ENV GPERFTOOLS_INC_DIR=${GPERFTOOLS_DIR}/include ENV GPERFTOOLS_LIB_DIR=${GPERFTOOLS_DIR}/lib -ENV GPERFTOOLS_SRC_DIR=${GPERFTOOLS_DIR}/src +ENV GPERFTOOLS_SRC_DIR=/usr/src/gperftools/${GPERFTOOLS_VERSION} ARG GPERFTOOLS_DOWNLOAD_URL=https://github.com/gperftools/gperftools/releases/download/gperftools-${GPERFTOOLS_VERSION}/gperftools-${GPERFTOOLS_VERSION}.tar.gz ARG GPERFTOOLS_TEMP=/tmp/gperftools-${GPERFTOOLS_VERSION}.tar.gz ARG GPERFTOOLS_TEMP_SRC=/tmp/gperftools-${GPERFTOOLS_VERSION} @@ -169,7 +166,7 @@ ENV OPENSSL_111_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_111_VERSION} ENV OPENSSL_111_BIN_DIR=${OPENSSL_111_DIR}/bin ENV OPENSSL_111_INC_DIR=${OPENSSL_111_DIR}/include ENV OPENSSL_111_LIB_DIR=${OPENSSL_111_DIR}/lib -ENV OPENSSL_111_SRC_DIR=${OPENSSL_111_DIR}/src +ENV OPENSSL_111_SRC_DIR=/usr/src/openssl/${OPENSSL_111_VERSION} ARG OPENSSL_111_DOWNLOAD_URL=https://www.openssl.org/source/old/${OPENSSL_111_VERSION}/openssl-${OPENSSL_111_VERSION}w.tar.gz ARG OPENSSL_111_TEMP=/tmp/openssl-${OPENSSL_111_VERSION}w.tar.gz ARG OPENSSL_111_TEMP_SRC=/tmp/openssl-${OPENSSL_111_VERSION}w @@ -180,7 +177,7 @@ ENV OPENSSL_30_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_30_VERSION} ENV OPENSSL_30_BIN_DIR=${OPENSSL_30_DIR}/bin ENV OPENSSL_30_INC_DIR=${OPENSSL_30_DIR}/include ENV OPENSSL_30_LIB_DIR=${OPENSSL_30_DIR}/lib64 -ENV OPENSSL_30_SRC_DIR=${OPENSSL_30_DIR}/src +ENV OPENSSL_30_SRC_DIR=/usr/src/openssl/${OPENSSL_30_VERSION} ARG OPENSSL_30_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_30_VERSION}.tar.gz ARG OPENSSL_30_TEMP=/tmp/openssl-${OPENSSL_30_VERSION}.tar.gz ARG OPENSSL_30_TEMP_SRC=/tmp/openssl-${OPENSSL_30_VERSION} @@ -191,7 +188,7 @@ ENV OPENSSL_31_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_31_VERSION} ENV OPENSSL_31_BIN_DIR=${OPENSSL_31_DIR}/bin ENV OPENSSL_31_INC_DIR=${OPENSSL_31_DIR}/include ENV OPENSSL_31_LIB_DIR=${OPENSSL_31_DIR}/lib64 -ENV OPENSSL_31_SRC_DIR=${OPENSSL_31_DIR}/src +ENV OPENSSL_31_SRC_DIR=/usr/src/openssl/${OPENSSL_31_VERSION} ARG OPENSSL_31_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_31_VERSION}.tar.gz ARG OPENSSL_31_TEMP=/tmp/openssl-${OPENSSL_31_VERSION}.tar.gz ARG OPENSSL_31_TEMP_SRC=/tmp/openssl-${OPENSSL_31_VERSION} @@ -202,7 +199,7 @@ ENV OPENSSL_32_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_32_VERSION} ENV OPENSSL_32_BIN_DIR=${OPENSSL_32_DIR}/bin ENV OPENSSL_32_INC_DIR=${OPENSSL_32_DIR}/include ENV OPENSSL_32_LIB_DIR=${OPENSSL_32_DIR}/lib64 -ENV OPENSSL_32_SRC_DIR=${OPENSSL_32_DIR}/src +ENV OPENSSL_32_SRC_DIR=/usr/src/openssl/${OPENSSL_32_VERSION} ARG OPENSSL_32_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_32_VERSION}.tar.gz ARG OPENSSL_32_TEMP=/tmp/openssl-${OPENSSL_32_VERSION}.tar.gz ARG OPENSSL_32_TEMP_SRC=/tmp/openssl-${OPENSSL_32_VERSION} @@ -213,7 +210,7 @@ ENV OPENSSL_33_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_33_VERSION} ENV OPENSSL_33_BIN_DIR=${OPENSSL_33_DIR}/bin ENV OPENSSL_33_INC_DIR=${OPENSSL_33_DIR}/include ENV OPENSSL_33_LIB_DIR=${OPENSSL_33_DIR}/lib64 -ENV OPENSSL_33_SRC_DIR=${OPENSSL_33_DIR}/src +ENV OPENSSL_33_SRC_DIR=/usr/src/openssl/${OPENSSL_33_VERSION} ARG OPENSSL_33_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_33_VERSION}.tar.gz ARG OPENSSL_33_TEMP=/tmp/openssl-${OPENSSL_33_VERSION}.tar.gz ARG OPENSSL_33_TEMP_SRC=/tmp/openssl-${OPENSSL_33_VERSION} @@ -223,7 +220,7 @@ ENV LIBRESSL_VERSION=3.9.2 ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} ENV LIBRESSL_INC_DIR=${LIBRESSL_DIR}/include ENV LIBRESSL_LIB_DIR=${LIBRESSL_DIR}/lib -ENV LIBRESSL_SRC_DIR=${LIBRESSL_DIR}/src +ENV LIBRESSL_SRC_DIR=/usr/src/libressl/${LIBRESSL_VERSION} ARG LIBRESSL_DOWNLOAD_URL=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz ARG LIBRESSL_TEMP=/tmp/libressl-${LIBRESSL_VERSION}.tar.gz ARG LIBRESSL_TEMP_SRC=/tmp/libressl-${LIBRESSL_VERSION} @@ -233,7 +230,7 @@ ENV BORINGSSL_VERSION=master ENV BORINGSSL_DIR=${EMG_LOCAL_BASE_DIR}/boringssl/${BORINGSSL_VERSION} ENV BORINGSSL_INC_DIR=${BORINGSSL_DIR}/include ENV BORINGSSL_LIB_DIR=${BORINGSSL_DIR}/lib -ENV BORINGSSL_SRC_DIR=${BORINGSSL_DIR}/src +ENV BORINGSSL_SRC_DIR=/usr/src/boringssl/${BORINGSSL_VERSION} ARG BORINGSSL_DOWNLOAD_URL=https://boringssl.googlesource.com/boringssl ARG BORINGSSL_TEMP_SRC=/tmp/boringssl @@ -421,6 +418,7 @@ ADD ${ZLIB_DOWNLOAD_URL} /tmp RUN tar -xzf ${ZLIB_TEMP} --directory /tmp && \ cp -rfv ${ZLIB_TEMP_SRC}/* ${ZLIB_SRC_DIR} && \ + ln -sf ${ZLIB_SRC_DIR} ${ZLIB_DIR}/src && \ cd ${ZLIB_TEMP_SRC} && \ ./configure \ --static \ @@ -439,6 +437,7 @@ ADD ${ZSTD_DOWNLOAD_URL} /tmp RUN tar -xzf ${ZSTD_TEMP} --directory /tmp && \ cp -rfv ${ZSTD_TEMP_SRC}/* ${ZSTD_SRC_DIR} && \ + ln -sf ${ZSTD_SRC_DIR} ${ZSTD_DIR}/src && \ cd ${ZSTD_TEMP_SRC} && \ mkdir -p ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ cd ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ @@ -500,6 +499,7 @@ RUN echo "=============================================" && \ RUN mkdir -p ${LUAJIT2OR_DIR} ${LUAJIT2OR_SRC_DIR} && \ git clone ${LUAJIT2OR_DOWNLOAD_URL} ${LUAJIT2OR_TEMP_SRC} && \ cp -rfv ${LUAJIT2OR_TEMP_SRC}/* ${LUAJIT2OR_SRC_DIR} && \ + ln -sf ${LUAJIT2OR_SRC_DIR} ${LUAJIT2OR_DIR}/src && \ cd ${LUAJIT2OR_TEMP_SRC} && \ make -j$(nproc) XCFLAGS='-DLUAJIT_ENABLE_GC64' BUILDMODE=static && \ make -j$(nproc) install PREFIX=${LUAJIT2OR_DIR} && \ @@ -520,6 +520,7 @@ ADD ${IP2LOC_DOWNLOAD_URL} /tmp RUN tar -xzf ${IP2LOC_TEMP} --directory /tmp && \ cp -rfv ${IP2LOC_TEMP_SRC}/* ${IP2LOC_SRC_DIR} && \ + ln -sf ${IP2LOC_SRC_DIR} ${IP2LOC_DIR}/src && \ cd ${IP2LOC_TEMP_SRC} && \ autoreconf -i -v --force && \ aclocal && \ @@ -547,6 +548,7 @@ ADD ${LIBATOMICOPS_DOWNLOAD_URL} /tmp RUN tar -xzf ${LIBATOMICOPS_TEMP} --directory /tmp && \ cp -rfv ${LIBATOMICOPS_TEMP_SRC}/* ${LIBATOMICOPS_SRC_DIR} && \ + ln -sf ${LIBATOMICOPS_SRC_DIR} ${LIBATOMICOPS_DIR}/src && \ cd ${LIBATOMICOPS_TEMP_SRC} && \ ./autogen.sh && \ ./configure \ @@ -570,6 +572,7 @@ RUN mkdir -p ${LIBIMAGEQUANT_DIR} ${LIBIMAGEQUANT_SRC_DIR} RUN git clone ${LIBIMAGEQUANT_DOWNLOAD_URL} ${LIBIMAGEQUANT_TEMP_SRC} && \ cp -rfv ${LIBIMAGEQUANT_TEMP_SRC}/* ${LIBIMAGEQUANT_SRC_DIR} && \ + ln -sf ${LIBIMAGEQUANT_SRC_DIR} ${LIBIMAGEQUANT_DIR}/src && \ cd ${LIBIMAGEQUANT_TEMP_SRC} && \ cargo build --release && \ cd ${LIBIMAGEQUANT_TEMP_SRC}/imagequant-sys && \ @@ -584,6 +587,7 @@ RUN mkdir -p ${LIBRAQM_DIR} ${LIBRAQM_SRC_DIR} RUN git clone ${LIBRAQM_DOWNLOAD_URL} ${LIBRAQM_TEMP_SRC} && \ cp -rfv ${LIBRAQM_TEMP_SRC}/* ${LIBRAQM_SRC_DIR} && \ + ln -sf ${LIBRAQM_SRC_DIR} ${LIBRAQM_DIR}/src && \ cd ${LIBRAQM_TEMP_SRC} && \ meson build && \ ninja -C build && \ @@ -597,6 +601,7 @@ ADD ${LIBGD_DOWNLOAD_URL} /tmp RUN tar -xzf ${LIBGD_TEMP} --directory /tmp && \ cp -rfv ${LIBGD_TEMP_SRC}/* ${LIBGD_SRC_DIR} && \ + ln -sf ${LIBGD_SRC_DIR} ${LIBGD_DIR}/src && \ cd ${LIBGD_TEMP_SRC} && \ ./bootstrap.sh && \ ./configure \ @@ -636,6 +641,7 @@ ADD ${LIBXML2_DOWNLOAD_URL} /tmp RUN tar -xzf ${LIBXML2_TEMP} --directory /tmp && \ cp -rfv ${LIBXML2_TEMP_SRC}/* ${LIBXML2_SRC_DIR} && \ + ln -sf ${LIBXML2_SRC_DIR} ${LIBXML2_DIR}/src && \ cd ${LIBXML2_TEMP_SRC} && \ ./autogen.sh && \ ./configure \ @@ -695,6 +701,7 @@ ADD ${LIBXSLT_DOWNLOAD_URL} /tmp RUN tar -xzf ${LIBXSLT_TEMP} --directory /tmp && \ cp -rfv ${LIBXSLT_TEMP_SRC}/* ${LIBXSLT_SRC_DIR} && \ + ln -sf ${LIBXSLT_SRC_DIR} ${LIBXSLT_DIR}/src && \ cd ${LIBXSLT_TEMP_SRC} && \ ./autogen.sh && \ ./configure \ @@ -725,6 +732,7 @@ ADD ${MM_GEOIP_DOWNLOAD_URL} /tmp RUN tar -xzf ${MM_GEOIP_TEMP} --directory /tmp && \ cp -rfv ${MM_GEOIP_TEMP_SRC}/* ${MM_GEOIP_SRC_DIR} && \ + ln -sf ${MM_GEOIP_SRC_DIR} ${MM_GEOIP_DIR}/src && \ cd ${MM_GEOIP_TEMP_SRC} && \ ./bootstrap && \ aclocal && \ @@ -753,6 +761,7 @@ ADD ${GPERFTOOLS_DOWNLOAD_URL} /tmp RUN tar -xzf ${GPERFTOOLS_TEMP} --directory /tmp && \ cp -rfv ${GPERFTOOLS_TEMP_SRC}/* ${GPERFTOOLS_SRC_DIR} && \ + ln -sf ${GPERFTOOLS_SRC_DIR} ${GPERFTOOLS_DIR}/src && \ cd ${GPERFTOOLS_TEMP_SRC} && \ ./configure \ --prefix=${GPERFTOOLS_DIR} \ @@ -779,6 +788,7 @@ ADD ${OPENSSL_111_DOWNLOAD_URL} /tmp RUN tar -xzf ${OPENSSL_111_TEMP} --directory /tmp && \ cp -rfv ${OPENSSL_111_TEMP_SRC}/* ${OPENSSL_111_SRC_DIR} && \ + ln -sf ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_DIR}/src && \ cd ${OPENSSL_111_TEMP_SRC} && \ ./config \ no-shared \ @@ -804,6 +814,7 @@ ADD ${OPENSSL_30_DOWNLOAD_URL} /tmp RUN tar -xzf ${OPENSSL_30_TEMP} --directory /tmp && \ cp -rfv ${OPENSSL_30_TEMP_SRC}/* ${OPENSSL_30_SRC_DIR} && \ + ln -sf ${OPENSSL_30_SRC_DIR} ${OPENSSL_30_DIR}/src && \ cd ${OPENSSL_30_TEMP_SRC} && \ ./config \ no-shared \ @@ -832,6 +843,7 @@ ADD ${OPENSSL_31_DOWNLOAD_URL} /tmp RUN tar -xzf ${OPENSSL_31_TEMP} --directory /tmp && \ cp -rfv ${OPENSSL_31_TEMP_SRC}/* ${OPENSSL_31_SRC_DIR} && \ + ln -sf ${OPENSSL_31_SRC_DIR} ${OPENSSL_31_DIR}/src && \ cd ${OPENSSL_31_TEMP_SRC} && \ ./config \ no-shared \ @@ -860,6 +872,7 @@ ADD ${OPENSSL_32_DOWNLOAD_URL} /tmp RUN tar -xzf ${OPENSSL_32_TEMP} --directory /tmp && \ cp -rfv ${OPENSSL_32_TEMP_SRC}/* ${OPENSSL_32_SRC_DIR} && \ + ln -sf ${OPENSSL_32_SRC_DIR} ${OPENSSL_32_DIR}/src && \ cd ${OPENSSL_32_TEMP_SRC} && \ ./config \ no-shared \ @@ -890,6 +903,7 @@ ADD ${OPENSSL_33_DOWNLOAD_URL} /tmp RUN tar -xzf ${OPENSSL_33_TEMP} --directory /tmp && \ cp -rfv ${OPENSSL_33_TEMP_SRC}/* ${OPENSSL_33_SRC_DIR} && \ + ln -sf ${OPENSSL_33_SRC_DIR} ${OPENSSL_33_DIR}/src && \ cd ${OPENSSL_33_TEMP_SRC} && \ ./config \ no-shared \ @@ -910,7 +924,9 @@ RUN tar -xzf ${OPENSSL_33_TEMP} --directory /tmp && \ --prefix=${OPENSSL_33_DIR} \ && \ make -j$(nproc) && \ - make -j$(nproc) install + make -j$(nproc) install && \ + cp -rfv ${OPENSSL_33_INC_DIR}/* /usr/local/include && \ + cp -rfv ${OPENSSL_33_LIB_DIR}/* /usr/local/lib ################################################################## # LibreSSL @@ -920,6 +936,7 @@ ADD ${LIBRESSL_DOWNLOAD_URL} /tmp RUN tar -xzf ${LIBRESSL_TEMP} --directory /tmp && \ cp -rfv ${LIBRESSL_TEMP_SRC}/* ${LIBRESSL_SRC_DIR} && \ + ln -sf ${LIBRESSL_SRC_DIR} ${LIBRESSL_DIR}/src && \ cd ${LIBRESSL_TEMP_SRC} && \ ./config \ --enable-static \ @@ -928,7 +945,9 @@ RUN tar -xzf ${LIBRESSL_TEMP} --directory /tmp && \ --prefix=${LIBRESSL_DIR} \ && \ make -j$(nproc) && \ - make -j$(nproc) install + make -j$(nproc) install && \ + cp -rfv ${LIBRESSL_INC_DIR}/* /usr/local/include && \ + cp -rfv ${LIBRESSL_LIB_DIR}/* /usr/local/lib ################################################################## # BoringSSL @@ -936,12 +955,15 @@ RUN tar -xzf ${LIBRESSL_TEMP} --directory /tmp && \ RUN mkdir -p ${BORINGSSL_DIR} ${BORINGSSL_SRC_DIR} && \ git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP_SRC} && \ cp -rfv ${BORINGSSL_TEMP_SRC}/* ${BORINGSSL_SRC_DIR} && \ + ln -sf ${BORINGSSL_SRC_DIR} ${BORINGSSL_DIR}/src && \ cd ${BORINGSSL_TEMP_SRC} && \ mkdir ${BORINGSSL_TEMP_SRC}/build && \ cd ${BORINGSSL_TEMP_SRC}/build && \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} .. && \ make -j$(if [ $(nproc) -gt 8 ]; then echo $(( $(nproc) / 2 )); else echo $(nproc); fi) && \ - make -j$(nproc) install + make -j$(nproc) install && \ + cp -rfv ${BORINGSSL_INC_DIR}/* /usr/local/include && \ + cp -rfv ${BORINGSSL_LIB_DIR}/* /usr/local/lib ################################################################## # Set default workdir @@ -964,6 +986,6 @@ RUN echo "clean up" && \ RUN updatedb -#TODO: -# replace dest folder of sources to /usr/src/program/version folder and link it to /program/version/src -# v PCRE2 +#TODO +# 1/ Echo '/usr/local/gperftools/lib'>/etc/ld. so. conf. d/my_app_lib.conf +# 2/ ln-s/usr/local/gperftool/lib/*/usr/local/lib. \ No newline at end of file diff --git a/linux/ecosystem/nginx/1.27.0/main/Dockerfile b/linux/ecosystem/nginx/1.27.0/main/Dockerfile index f5035fd65..4dacd7b7e 100644 --- a/linux/ecosystem/nginx/1.27.0/main/Dockerfile +++ b/linux/ecosystem/nginx/1.27.0/main/Dockerfile @@ -151,8 +151,20 @@ RUN tar -xf ${NGINX_TEMP} --directory /tmp && \ git clone https://github.com/yaoweibin/nginx_upstream_check_module modules/nginx-upstream-check-module RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ - NGINX_INCLUDE_PATHS=$(find /usr/local/include -type d | sed 's/^/-I/' | tr '\n' ' ') && \ - NGINX_LIB_PATHS=$(find /usr/local/lib -type d | sed 's/^/-L/' | tr '\n' ' ') && \ + cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/include/libxml2/libxml/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/include/libexslt/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/include/libxslt/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/luajit2/2.1/include/luajit-2.1/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/gperftools/2.15/include/google/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/gperftools/2.15/include/gperftools/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/include/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/lib/* /usr/lib && \ + cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/lib/* /usr/lib && \ + cp -rfv /usr/local/share/epicmorg/luajit2/2.1/lib/* /usr/lib && \ + cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/lib/* /usr/lib && \ + cp -rfv /usr/local/share/epicmorg/gperftools/2.15/lib/* /usr/lib && \ + cp -rfv /usr/local/share/epicmorg/geoip/1.6.12/lib/* /usr/lib && \ + ldconfig && \ ./configure \ --user=www-data \ --group=www-data \ @@ -170,8 +182,27 @@ RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ --http-proxy-temp-path=${NGINX_CACHE_DIR}/proxy \ --http-scgi-temp-path=${NGINX_CACHE_DIR}/scgi \ --http-uwsgi-temp-path=${NGINX_CACHE_DIR}/uwsgi \ - --with-cc-opt='-static -g -O2 -lz -fPIC -Wdate-time -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wno-error=unused-but-set-variable -Wformat -Wno-error=date-time -Wno-error=implicit-fallthrough -Wno-error=cast-function-type -Wno-error=format-security -Wno-error=implicit-function-declaration -Wno-error=deprecated-declarations -Wno-error=unused-result -Wdate-time ${NGINX_INCLUDE_PATHS}' \ - --with-ld-opt='-static -Wl,-z,relro -Wl,-z,now -lz -fPIC ${NGINX_LIB_PATHS}' \ + --with-cc-opt="-I/usr/local/share/epicmorg/ip2location/8.7.0/include \ + -I/usr/local/share/epicmorg/libxml2/2.13.2/include/libxml2/libxml \ + -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libexslt \ + -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libxslt \ + -I/usr/local/share/epicmorg/luajit2/2.1/include/luajit-2.1 \ + -I/usr/local/share/epicmorg/libgd/2.3.3/include \ + -I/usr/local/share/epicmorg/gperftools/2.15/include/google \ + -I/usr/local/share/epicmorg/gperftools/2.15/include/gperftools \ + -I/usr/local/share/epicmorg/geoip/1.6.12/include \ + -static -g -O2 -lz -fPIC -Wdate-time -D_FORTIFY_SOURCE=2 -fstack-protector-strong \ + -Wno-error=unused-but-set-variable -Wformat -Wno-error=date-time -Wno-error=implicit-fallthrough \ + -Wno-error=cast-function-type -Wno-error=format-security -Wno-error=implicit-function-declaration \ + -Wno-error=deprecated-declarations -Wno-error=unused-result" \ + --with-ld-opt="-L/usr/local/share/epicmorg/ip2location/8.7.0/lib \ + -L/usr/local/share/epicmorg/libxml2/2.13.2/lib \ + -L/usr/local/share/epicmorg/libxslt/1.1.42/lib \ + -L/usr/local/share/epicmorg/luajit2/2.1/lib \ + -L/usr/local/share/epicmorg/libgd/2.3.3/lib \ + -L/usr/local/share/epicmorg/gperftools/2.15/lib \ + -L/usr/local/share/epicmorg/geoip/1.6.12/lib \ + -static -Wl,-z,relro -Wl,-z,now -lz -fPIC" \ --with-pcre=${PCRE_SRC_DIR} \ --with-pcre-jit \ --with-zlib=${ZLIB_SRC_DIR} \ @@ -240,7 +271,7 @@ RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ ## gd fuck ## --with-http_image_filter_module \ ## perftools fuck -## --with-google_perftools_module \ + --with-google_perftools_module \ ## perl problem fuck ## --with-http_perl_module \ ## diff --git a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile index d4f52b877..cea225e75 100644 --- a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile @@ -39,7 +39,7 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P # Installing PHP7 ################################################################## #Install base packages -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/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ @@ -117,8 +117,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP7 ################################################################## -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/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ diff --git a/linux/ecosystem/php/php7.0/Dockerfile b/linux/ecosystem/php/php7.0/Dockerfile index 955d3e4b4..14a74dca5 100644 --- a/linux/ecosystem/php/php7.0/Dockerfile +++ b/linux/ecosystem/php/php7.0/Dockerfile @@ -30,11 +30,6 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## # Installing PHP7 ################################################################## -#installing php repo -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' #Install base packages RUN apt-get update && \ @@ -105,10 +100,8 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP7 ################################################################## -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' + && \ + sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://ftp.mpi-inf.mpg.de/mirrors/linux/mirror/deb.sury.org/repositories/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php7.1/Dockerfile b/linux/ecosystem/php/php7.1/Dockerfile index 2fc16aea0..969c1c5bc 100644 --- a/linux/ecosystem/php/php7.1/Dockerfile +++ b/linux/ecosystem/php/php7.1/Dockerfile @@ -30,11 +30,6 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## # Installing PHP7 ################################################################## -#installing php repo -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' #Install base packages RUN apt-get update && \ @@ -105,10 +100,8 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP7 ################################################################## -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' + && \ + sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://ftp.mpi-inf.mpg.de/mirrors/linux/mirror/deb.sury.org/repositories/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php7.2/Dockerfile b/linux/ecosystem/php/php7.2/Dockerfile index 7351094d1..d4f2d9c06 100644 --- a/linux/ecosystem/php/php7.2/Dockerfile +++ b/linux/ecosystem/php/php7.2/Dockerfile @@ -30,11 +30,6 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## # Installing PHP7 ################################################################## -#installing php repo -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' #Install base packages RUN apt-get update && \ @@ -105,10 +100,8 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP7 ################################################################## -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' + && \ + sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://ftp.mpi-inf.mpg.de/mirrors/linux/mirror/deb.sury.org/repositories/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index c045eca5f..49f90ede2 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -30,11 +30,6 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## # Installing PHP7 ################################################################## -#installing php repo -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' #Install base packages RUN apt-get update && \ @@ -105,10 +100,8 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP7 ################################################################## -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' + && \ + sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://ftp.mpi-inf.mpg.de/mirrors/linux/mirror/deb.sury.org/repositories/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php7.4/Dockerfile b/linux/ecosystem/php/php7.4/Dockerfile index 333385609..d6d630532 100644 --- a/linux/ecosystem/php/php7.4/Dockerfile +++ b/linux/ecosystem/php/php7.4/Dockerfile @@ -30,12 +30,6 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## # Installing PHP7 ################################################################## -#Install base packages -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 && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ @@ -112,10 +106,8 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP7 ################################################################## -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' + && \ + sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://ftp.mpi-inf.mpg.de/mirrors/linux/mirror/deb.sury.org/repositories/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile index 224a3536f..66f49c2c5 100644 --- a/linux/ecosystem/php/php8.0/Dockerfile +++ b/linux/ecosystem/php/php8.0/Dockerfile @@ -13,10 +13,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP8 ################################################################## -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 && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php8.1/Dockerfile b/linux/ecosystem/php/php8.1/Dockerfile index 36775d3bd..f1255e4b2 100644 --- a/linux/ecosystem/php/php8.1/Dockerfile +++ b/linux/ecosystem/php/php8.1/Dockerfile @@ -13,10 +13,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP8 ################################################################## -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 && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php8.2/Dockerfile b/linux/ecosystem/php/php8.2/Dockerfile index 8ff5b95ee..e11fe3c59 100644 --- a/linux/ecosystem/php/php8.2/Dockerfile +++ b/linux/ecosystem/php/php8.2/Dockerfile @@ -13,10 +13,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini ################################################################## # Installing PHP8 ################################################################## -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 && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/php/php8.3/Dockerfile b/linux/ecosystem/php/php8.3/Dockerfile index bf90f765d..e8eddfc20 100644 --- a/linux/ecosystem/php/php8.3/Dockerfile +++ b/linux/ecosystem/php/php8.3/Dockerfile @@ -14,11 +14,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini # Installing PHP8 ################################################################## -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 && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \