From c13a520001e0a2f66fc7672d40ce2341354ea0eb Mon Sep 17 00:00:00 2001 From: STAM Date: Thu, 5 Dec 2024 18:41:17 +0300 Subject: [PATCH] various fixes various fixes --- .../workflows/epicmorg.base.images.web.yml | 72 +++++++++---------- linux/ecosystem/apache2/php7.3/Dockerfile | 16 ++--- linux/ecosystem/apache2/php7.4/Dockerfile | 15 ++-- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/.github/workflows/epicmorg.base.images.web.yml b/.github/workflows/epicmorg.base.images.web.yml index 9f06c3cb5..a879c86ba 100644 --- a/.github/workflows/epicmorg.base.images.web.yml +++ b/.github/workflows/epicmorg.base.images.web.yml @@ -66,42 +66,42 @@ jobs: - name: "Build and Deploy Apache 2 + PHP 8.3 Image:" run: cd linux/ecosystem/apache2/php8.3 && pwd && make build && make deploy -################################################################################## - - build-nginx-images: - name: Build EpicMorg NginX Images - runs-on: ubuntu-24.04 - - steps: - - uses: actions/checkout@v4 - - name: Log into registry - run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin - - - name: Test Make - run: make - - - name: Install requirements.txt - run: make pip - - - name: "Build and Deploy NginX Image:" - run: cd linux/ecosystem/nginx/latest/mainline/main && pwd && make build && make deploy - - - name: "Build and Deploy NginX + PHP7.4 Image:" - run: cd linux/ecosystem/nginx/latest/mainline/php && pwd && make build && make deploy - - - name: "Build and Deploy NginX + RTMP-HLS Image:" - run: cd linux/ecosystem/nginx/latest/mainline/rtmp-hls && pwd && make build && make deploy - -# - name: "Build and Deploy NginX (quic, http3) Image:" -# run: cd linux/ecosystem/nginx/latest/quic/main && pwd && make build && make deploy - -# - name: "Build and Deploy NginX (quic, http3) + PHP7.4 Image:" -# run: cd linux/ecosystem/nginx/latest/quic/php && pwd && make build && make deploy - -# - name: "Build and Deploy NginX (quic, http3) + RTMP-HLS Image:" -# run: cd linux/ecosystem/nginx/latest/quic/rtmp-hls && pwd && make build && make deploy - -################################################################################## +# ################################################################################## +# +# build-nginx-images: +# name: Build EpicMorg NginX Images +# runs-on: ubuntu-24.04 +# +# steps: +# - uses: actions/checkout@v4 +# - name: Log into registry +# run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin +# +# - name: Test Make +# run: make +# +# - name: Install requirements.txt +# run: make pip +# +# - name: "Build and Deploy NginX Image:" +# run: cd linux/ecosystem/nginx/latest/mainline/main && pwd && make build && make deploy +# +# - name: "Build and Deploy NginX + PHP7.4 Image:" +# run: cd linux/ecosystem/nginx/latest/mainline/php && pwd && make build && make deploy +# +# - name: "Build and Deploy NginX + RTMP-HLS Image:" +# run: cd linux/ecosystem/nginx/latest/mainline/rtmp-hls && pwd && make build && make deploy +# +# # - name: "Build and Deploy NginX (quic, http3) Image:" +# # run: cd linux/ecosystem/nginx/latest/quic/main && pwd && make build && make deploy +# +# # - name: "Build and Deploy NginX (quic, http3) + PHP7.4 Image:" +# # run: cd linux/ecosystem/nginx/latest/quic/php && pwd && make build && make deploy +# +# # - name: "Build and Deploy NginX (quic, http3) + RTMP-HLS Image:" +# # run: cd linux/ecosystem/nginx/latest/quic/rtmp-hls && pwd && make build && make deploy +# +# ################################################################################## - name: Cleanup run: make docker-clean diff --git a/linux/ecosystem/apache2/php7.3/Dockerfile b/linux/ecosystem/apache2/php7.3/Dockerfile index 42aee97d6..2fc78b3d6 100644 --- a/linux/ecosystem/apache2/php7.3/Dockerfile +++ b/linux/ecosystem/apache2/php7.3/Dockerfile @@ -8,6 +8,14 @@ ARG PHP_DIR=/etc/php/${PHP_VER} ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini +################################################################## +# Installing Apache2 +################################################################## +#installing apache2 repo +RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg +RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + ################################################################## # gh official binary ################################################################## @@ -22,14 +30,6 @@ RUN echo "=============================================" && \ echo gh $(gh --version) && \ echo "=============================================" -################################################################## -# Installing Apache2 -################################################################## -#installing apache2 repo -RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/apache2/php7.4/Dockerfile b/linux/ecosystem/apache2/php7.4/Dockerfile index e4ae3d3b5..262d2d0f6 100644 --- a/linux/ecosystem/apache2/php7.4/Dockerfile +++ b/linux/ecosystem/apache2/php7.4/Dockerfile @@ -9,6 +9,14 @@ ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini +################################################################## +# Installing Apache2 +################################################################## +#installing apache2 repo +RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg +RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + ################################################################## # gh official binary ################################################################## @@ -23,13 +31,6 @@ RUN echo "=============================================" && \ echo gh $(gh --version) && \ echo "=============================================" -################################################################## -# Installing Apache2 -################################################################## -#installing apache2 repo -RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' - #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \