From df0b287a3d325c8e241adf746738e31e3b8ce114 Mon Sep 17 00:00:00 2001 From: STAM Date: Thu, 5 Dec 2024 18:24:33 +0300 Subject: [PATCH] various fixes --- .../epicmorg.base.images.giltab.runners.yml | 266 +++++++++--------- .../epicmorg.base.images.teamcity.agents.yml | 74 ++++- .../epicmorg.experimental.images.yml | 4 +- Makefile | 13 +- linux/ecosystem/apache2/php5.5/Dockerfile | 6 +- linux/ecosystem/apache2/php7.0/Dockerfile | 20 +- linux/ecosystem/apache2/php7.1/Dockerfile | 20 +- linux/ecosystem/apache2/php7.2/Dockerfile | 20 +- linux/ecosystem/apache2/php7.3/Dockerfile | 20 +- linux/ecosystem/apache2/php7.4/Dockerfile | 19 +- linux/ecosystem/apache2/php8.0/Dockerfile | 20 +- linux/ecosystem/apache2/php8.1/Dockerfile | 20 +- linux/ecosystem/apache2/php8.2/Dockerfile | 20 +- linux/ecosystem/apache2/php8.3/Dockerfile | 20 +- .../gitlab/runner/amxx-sdk/1.10/Dockerfile | 2 + .../gitlab/runner/amxx-sdk/1.9/Dockerfile | 2 + .../runner/android-sdk/jdk11/Dockerfile | 21 +- .../runner/android-sdk/jdk17/Dockerfile | 17 +- .../gitlab/runner/android-sdk/jdk8/Dockerfile | 21 +- .../gitlab/runner/atlassian-sdk/Dockerfile | 8 +- .../atlassian-sdk/apt/keyrings/atlassian.asc | 86 ++++++ .../apt/sources.list.d/atlassian-sdk.list | 1 + .../gitlab/runner/dotnet-sdk/Dockerfile | 94 +++---- .../ecosystem/gitlab/runner/latest/Dockerfile | 20 +- .../runner/latest/install-gitlab-runner.sh | 10 - .../gitlab/runner/node0.12/Dockerfile | 16 +- .../ecosystem/gitlab/runner/node10/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node11/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node12/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node13/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node14/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node15/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node16/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node17/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node18/Dockerfile | 16 +- .../ecosystem/gitlab/runner/node19/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node20/Dockerfile | 16 +- .../ecosystem/gitlab/runner/node21/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node22/Dockerfile | 16 +- .../ecosystem/gitlab/runner/node4/Dockerfile | 16 +- .../ecosystem/gitlab/runner/node5/Dockerfile | 16 +- .../ecosystem/gitlab/runner/node6/Dockerfile | 18 +- .../ecosystem/gitlab/runner/node7/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node8/Dockerfile | 14 +- .../ecosystem/gitlab/runner/node9/Dockerfile | 14 +- .../gitlab/runner/steam-sdk/Dockerfile | 26 -- .../gitlab/runner/steam-sdk/Makefile | 36 --- .../gitlab/runner/steam-sdk/README.md | 0 .../runner/steam-sdk/docker-compose.yml | 6 - .../nginx/latest/mainline/php/Dockerfile | 2 +- .../teamcity/agent/latest/Dockerfile | 5 +- .../teamcity/agent/latest/Dockerfile.jdk11 | 2 +- .../teamcity/agent/latest/Dockerfile.jdk17 | 2 +- .../teamcity/agent/latest/Dockerfile.jdk21 | 2 +- 54 files changed, 698 insertions(+), 503 deletions(-) create mode 100644 linux/ecosystem/gitlab/runner/atlassian-sdk/apt/keyrings/atlassian.asc create mode 100644 linux/ecosystem/gitlab/runner/atlassian-sdk/apt/sources.list.d/atlassian-sdk.list delete mode 100755 linux/ecosystem/gitlab/runner/latest/install-gitlab-runner.sh delete mode 100644 linux/ecosystem/gitlab/runner/steam-sdk/Dockerfile delete mode 100644 linux/ecosystem/gitlab/runner/steam-sdk/Makefile delete mode 100644 linux/ecosystem/gitlab/runner/steam-sdk/README.md delete mode 100644 linux/ecosystem/gitlab/runner/steam-sdk/docker-compose.yml diff --git a/.github/workflows/epicmorg.base.images.giltab.runners.yml b/.github/workflows/epicmorg.base.images.giltab.runners.yml index 5f5ca70a8..aad792ca7 100644 --- a/.github/workflows/epicmorg.base.images.giltab.runners.yml +++ b/.github/workflows/epicmorg.base.images.giltab.runners.yml @@ -88,7 +88,6 @@ jobs: - name: "Build and Deploy Gitlab Runner Atlassian SDK Image:" run: cd linux/ecosystem/gitlab/runner/atlassian-sdk && pwd && make build && make deploy - ################################################################################## @@ -112,137 +111,134 @@ jobs: run: make docker-clean ################################################################################## - - - name: "Build and Deploy Gitlab Runner node5 Image:" - run: cd linux/ecosystem/gitlab/runner/node5 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node6 Image:" - run: cd linux/ecosystem/gitlab/runner/node6 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node7 Image:" - run: cd linux/ecosystem/gitlab/runner/node7 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Gitlab Runner node8 Image:" - run: cd linux/ecosystem/gitlab/runner/node8 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node9 Image:" - run: cd linux/ecosystem/gitlab/runner/node9 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node10 Image:" - run: cd linux/ecosystem/gitlab/runner/node10 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Gitlab Runner node11 Image:" - run: cd linux/ecosystem/gitlab/runner/node11 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node12 Image:" - run: cd linux/ecosystem/gitlab/runner/node12 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node13 Image:" - run: cd linux/ecosystem/gitlab/runner/node13 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Gitlab Runner node14 Image:" - run: cd linux/ecosystem/gitlab/runner/node14 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node15 Image:" - run: cd linux/ecosystem/gitlab/runner/node15 && pwd && make build && make deploy - - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Gitlab Runner node16 Image:" - run: cd linux/ecosystem/gitlab/runner/node16 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node17 Image:" - run: cd linux/ecosystem/gitlab/runner/node17 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node18 Image:" - run: cd linux/ecosystem/gitlab/runner/node18 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Gitlab Runner node19 Image:" - run: cd linux/ecosystem/gitlab/runner/node19 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node20 Image:" - run: cd linux/ecosystem/gitlab/runner/node20 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node21 Image:" - run: cd linux/ecosystem/gitlab/runner/node21 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner node22 Image:" - run: cd linux/ecosystem/gitlab/runner/node22 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Gitlab Runner php7.2 Image:" - run: cd linux/ecosystem/gitlab/runner/php7.2 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner php7.3 Image:" - run: cd linux/ecosystem/gitlab/runner/php7.3 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner php7.4 Image:" - run: cd linux/ecosystem/gitlab/runner/php7.4 && pwd && make build && make deploy - - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Gitlab Runner php8.0 Image:" - run: cd linux/ecosystem/gitlab/runner/php8.0 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner php8.1 Image:" - run: cd linux/ecosystem/gitlab/runner/php8.1 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner php8.2 Image:" - run: cd linux/ecosystem/gitlab/runner/php8.2 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner php8.3 Image:" - run: cd linux/ecosystem/gitlab/runner/php8.3 && pwd && make build && make deploy - - - name: "Build and Deploy Gitlab Runner Steam SDK Image:" - run: cd linux/ecosystem/gitlab/runner/steam-sdk && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean +# +# - name: "Build and Deploy Gitlab Runner node5 Image:" +# run: cd linux/ecosystem/gitlab/runner/node5 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node6 Image:" +# run: cd linux/ecosystem/gitlab/runner/node6 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node7 Image:" +# run: cd linux/ecosystem/gitlab/runner/node7 && pwd && make build && make deploy +# +# ################################################################################## +# +# - name: Cleanup +# run: make docker-clean +# +# ################################################################################## +# +# - name: "Build and Deploy Gitlab Runner node8 Image:" +# run: cd linux/ecosystem/gitlab/runner/node8 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node9 Image:" +# run: cd linux/ecosystem/gitlab/runner/node9 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node10 Image:" +# run: cd linux/ecosystem/gitlab/runner/node10 && pwd && make build && make deploy +# +# ################################################################################## +# +# - name: Cleanup +# run: make docker-clean +# +# ################################################################################## +# +# - name: "Build and Deploy Gitlab Runner node11 Image:" +# run: cd linux/ecosystem/gitlab/runner/node11 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node12 Image:" +# run: cd linux/ecosystem/gitlab/runner/node12 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node13 Image:" +# run: cd linux/ecosystem/gitlab/runner/node13 && pwd && make build && make deploy +# +# ################################################################################## +# +# - name: Cleanup +# run: make docker-clean +# +# ################################################################################## +# +# - name: "Build and Deploy Gitlab Runner node14 Image:" +# run: cd linux/ecosystem/gitlab/runner/node14 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node15 Image:" +# run: cd linux/ecosystem/gitlab/runner/node15 && pwd && make build && make deploy +# +# +# ################################################################################## +# +# - name: Cleanup +# run: make docker-clean +# +# ################################################################################## +# +# - name: "Build and Deploy Gitlab Runner node16 Image:" +# run: cd linux/ecosystem/gitlab/runner/node16 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node17 Image:" +# run: cd linux/ecosystem/gitlab/runner/node17 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node18 Image:" +# run: cd linux/ecosystem/gitlab/runner/node18 && pwd && make build && make deploy +# +# ################################################################################## +# +# - name: Cleanup +# run: make docker-clean +# +# ################################################################################## +# +# - name: "Build and Deploy Gitlab Runner node19 Image:" +# run: cd linux/ecosystem/gitlab/runner/node19 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node20 Image:" +# run: cd linux/ecosystem/gitlab/runner/node20 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node21 Image:" +# run: cd linux/ecosystem/gitlab/runner/node21 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner node22 Image:" +# run: cd linux/ecosystem/gitlab/runner/node22 && pwd && make build && make deploy +# +# ################################################################################## +# +# - name: Cleanup +# run: make docker-clean +# +# ################################################################################## +# +# - name: "Build and Deploy Gitlab Runner php7.2 Image:" +# run: cd linux/ecosystem/gitlab/runner/php7.2 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner php7.3 Image:" +# run: cd linux/ecosystem/gitlab/runner/php7.3 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner php7.4 Image:" +# run: cd linux/ecosystem/gitlab/runner/php7.4 && pwd && make build && make deploy +# +# +# ################################################################################## +# +# - name: Cleanup +# run: make docker-clean +# +# ################################################################################## +# +# - name: "Build and Deploy Gitlab Runner php8.0 Image:" +# run: cd linux/ecosystem/gitlab/runner/php8.0 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner php8.1 Image:" +# run: cd linux/ecosystem/gitlab/runner/php8.1 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner php8.2 Image:" +# run: cd linux/ecosystem/gitlab/runner/php8.2 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner php8.3 Image:" +# run: cd linux/ecosystem/gitlab/runner/php8.3 && pwd && make build && make deploy +# +# - name: "Build and Deploy Gitlab Runner Steam SDK Image:" +# run: cd linux/ecosystem/gitlab/runner/steam-sdk && pwd && make build && make deploy +# +# ################################################################################## diff --git a/.github/workflows/epicmorg.base.images.teamcity.agents.yml b/.github/workflows/epicmorg.base.images.teamcity.agents.yml index 6e04748c1..b2444b50b 100644 --- a/.github/workflows/epicmorg.base.images.teamcity.agents.yml +++ b/.github/workflows/epicmorg.base.images.teamcity.agents.yml @@ -49,24 +49,56 @@ jobs: - name: "Build and Deploy TeamCity Agent amxX 1.10 SDK Image:" run: cd linux/ecosystem/teamcity/agent/amxx-sdk/1.10 && pwd && make build && make deploy +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + - name: "Build and Deploy TeamCity Agent Android SDK (jdk8) Image:" run: cd linux/ecosystem/teamcity/agent/android-sdk/jdk8 && pwd && make build && make deploy +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + - name: "Build and Deploy TeamCity Agent Android SDK (jdk11) Image:" run: cd linux/ecosystem/teamcity/agent/android-sdk/jdk1 && pwd && make build && make deploy - - name: "Build and Deploy TeamCity Agent Android SDK (jdk17) Image:" - run: cd linux/ecosystem/teamcity/agent/android-sdk/jdk7 && pwd && make build && make deploy - +################################################################################## + - name: Cleanup run: make docker-clean +################################################################################## + + - name: "Build and Deploy TeamCity Agent Android SDK (jdk17) Image:" + run: cd linux/ecosystem/teamcity/agent/android-sdk/jdk7 && pwd && make build && make deploy + +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + - name: "Build and Deploy TeamCity Agent Atlassian SDK Image:" run: cd linux/ecosystem/teamcity/agent/atlassian-sdk && pwd && make build && make deploy - name: "Build and Deploy TeamCity Agent dotNet SDK Image:" run: cd linux/ecosystem/teamcity/agent/dotnet-sdk && pwd && make build && make deploy +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + - name: "Build and Deploy TeamCity Agent node0.12 Image:" run: cd linux/ecosystem/teamcity/agent/node0.12 && pwd && make build && make deploy @@ -79,6 +111,13 @@ jobs: - name: "Build and Deploy TeamCity Agent node6 Image:" run: cd linux/ecosystem/teamcity/agent/node6 && pwd && make build && make deploy +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + - name: "Build and Deploy TeamCity Agent node7 Image:" run: cd linux/ecosystem/teamcity/agent/node7 && pwd && make build && make deploy @@ -91,6 +130,13 @@ jobs: - name: "Build and Deploy TeamCity Agent node10 Image:" run: cd linux/ecosystem/teamcity/agent/node10 && pwd && make build && make deploy +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + - name: "Build and Deploy TeamCity Agent node11 Image:" run: cd linux/ecosystem/teamcity/agent/node11 && pwd && make build && make deploy @@ -102,10 +148,14 @@ jobs: - name: "Build and Deploy TeamCity Agent node14 Image:" run: cd linux/ecosystem/teamcity/agent/node14 && pwd && make build && make deploy - + +################################################################################## + - name: Cleanup run: make docker-clean +################################################################################## + - name: "Build and Deploy TeamCity Agent node15 Image:" run: cd linux/ecosystem/teamcity/agent/node15 && pwd && make build && make deploy @@ -117,10 +167,14 @@ jobs: - name: "Build and Deploy TeamCity Agent node18 Image:" run: cd linux/ecosystem/teamcity/agent/node18 && pwd && make build && make deploy - + +################################################################################## + - name: Cleanup run: make docker-clean +################################################################################## + - name: "Build and Deploy TeamCity Agent node19 Image:" run: cd linux/ecosystem/teamcity/agent/node19 && pwd && make build && make deploy @@ -133,6 +187,13 @@ jobs: - name: "Build and Deploy TeamCity Agent node22 Image:" run: cd linux/ecosystem/teamcity/agent/node22 && pwd && make build && make deploy +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + # - name: "Build and Deploy TeamCity Agent php7.2 Image:" # run: cd linux/ecosystem/teamcity/agent/php7.2 && pwd && make build && make deploy # @@ -161,6 +222,3 @@ jobs: # run: cd linux/ecosystem/teamcity/agent/steam-sdk && pwd && make build && make deploy # ################################################################################## - - - name: Cleanup - run: make docker-clean diff --git a/.github/workflows/epicmorg.experimental.images.yml b/.github/workflows/epicmorg.experimental.images.yml index 5f9de3faf..d56b4bf35 100644 --- a/.github/workflows/epicmorg.experimental.images.yml +++ b/.github/workflows/epicmorg.experimental.images.yml @@ -2,8 +2,8 @@ name: EpicMorg experimental Images on: workflow_dispatch: - schedule: - - cron: '0 01 * * 2,4,6' +# schedule: +# - cron: '0 01 * * 2,4,6' jobs: diff --git a/Makefile b/Makefile index b182185a5..248999e7e 100644 --- a/Makefile +++ b/Makefile @@ -1139,13 +1139,12 @@ ecosystem-gitlab-runner-images: cd `pwd`/linux/ecosystem/gitlab/runner/node20 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/gitlab/runner/node21 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/gitlab/runner/node22 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/gitlab/runner/php7.2 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/gitlab/runner/php7.3 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/gitlab/runner/php7.4 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/gitlab/runner/php8.1 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/gitlab/runner/php8.2 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/gitlab/runner/php8.3 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/gitlab/runner/steam-sdk && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/gitlab/runner/php7.2 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/gitlab/runner/php7.3 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/gitlab/runner/php7.4 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/gitlab/runner/php8.1 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/gitlab/runner/php8.2 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/gitlab/runner/php8.3 && pwd && make build && make deploy ecosystem-nginx-images: cd `pwd`/linux/ecosystem/nginx/latest/mainline/main && pwd && make build && make deploy diff --git a/linux/ecosystem/apache2/php5.5/Dockerfile b/linux/ecosystem/apache2/php5.5/Dockerfile index 64ffde217..6da99bfd0 100644 --- a/linux/ecosystem/apache2/php5.5/Dockerfile +++ b/linux/ecosystem/apache2/php5.5/Dockerfile @@ -12,12 +12,14 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php5.5 \ diff --git a/linux/ecosystem/apache2/php7.0/Dockerfile b/linux/ecosystem/apache2/php7.0/Dockerfile index 37653b598..3485694d6 100644 --- a/linux/ecosystem/apache2/php7.0/Dockerfile +++ b/linux/ecosystem/apache2/php7.0/Dockerfile @@ -12,12 +12,28 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php7.0 \ diff --git a/linux/ecosystem/apache2/php7.1/Dockerfile b/linux/ecosystem/apache2/php7.1/Dockerfile index f339fd9c5..4439565e9 100644 --- a/linux/ecosystem/apache2/php7.1/Dockerfile +++ b/linux/ecosystem/apache2/php7.1/Dockerfile @@ -12,12 +12,28 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php7.1 \ diff --git a/linux/ecosystem/apache2/php7.2/Dockerfile b/linux/ecosystem/apache2/php7.2/Dockerfile index cf10d3fa3..c0896ec15 100644 --- a/linux/ecosystem/apache2/php7.2/Dockerfile +++ b/linux/ecosystem/apache2/php7.2/Dockerfile @@ -12,12 +12,28 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php7.2 \ diff --git a/linux/ecosystem/apache2/php7.3/Dockerfile b/linux/ecosystem/apache2/php7.3/Dockerfile index 9ae1591aa..42aee97d6 100644 --- a/linux/ecosystem/apache2/php7.3/Dockerfile +++ b/linux/ecosystem/apache2/php7.3/Dockerfile @@ -8,16 +8,32 @@ 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 +################################################################## +# gh official binary +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" + ################################################################## # Installing Apache2 ################################################################## #installing apache2 repo -RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php7.3 \ diff --git a/linux/ecosystem/apache2/php7.4/Dockerfile b/linux/ecosystem/apache2/php7.4/Dockerfile index 97e8291e5..e4ae3d3b5 100644 --- a/linux/ecosystem/apache2/php7.4/Dockerfile +++ b/linux/ecosystem/apache2/php7.4/Dockerfile @@ -9,16 +9,31 @@ 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 +################################################################## +# gh official binary +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" + ################################################################## # Installing Apache2 ################################################################## #installing apache2 repo -RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php7.4 \ diff --git a/linux/ecosystem/apache2/php8.0/Dockerfile b/linux/ecosystem/apache2/php8.0/Dockerfile index 87f4fa69f..9d5287613 100644 --- a/linux/ecosystem/apache2/php8.0/Dockerfile +++ b/linux/ecosystem/apache2/php8.0/Dockerfile @@ -14,12 +14,28 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php8.0 \ diff --git a/linux/ecosystem/apache2/php8.1/Dockerfile b/linux/ecosystem/apache2/php8.1/Dockerfile index d607fac53..6e366d4e8 100644 --- a/linux/ecosystem/apache2/php8.1/Dockerfile +++ b/linux/ecosystem/apache2/php8.1/Dockerfile @@ -14,12 +14,28 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php8.1 \ diff --git a/linux/ecosystem/apache2/php8.2/Dockerfile b/linux/ecosystem/apache2/php8.2/Dockerfile index f98d06210..5335e54aa 100644 --- a/linux/ecosystem/apache2/php8.2/Dockerfile +++ b/linux/ecosystem/apache2/php8.2/Dockerfile @@ -14,12 +14,28 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php8.2 \ diff --git a/linux/ecosystem/apache2/php8.3/Dockerfile b/linux/ecosystem/apache2/php8.3/Dockerfile index 4dfe7cdec..2ff897dc5 100644 --- a/linux/ecosystem/apache2/php8.3/Dockerfile +++ b/linux/ecosystem/apache2/php8.3/Dockerfile @@ -14,12 +14,28 @@ 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://packages.sury.org/apache2/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' +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 +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ + locate \ apache2 \ apache2-utils \ libapache2-mod-php8.3 \ diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile index 024cb78fe..692fdee72 100644 --- a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile @@ -45,3 +45,5 @@ RUN apt clean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile index 7bfeb45b2..a1e87967f 100644 --- a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile @@ -45,3 +45,5 @@ RUN apt clean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile index b0aa80f3e..1f021f25c 100644 --- a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile +++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile @@ -2,16 +2,15 @@ FROM epicmorg/gitlab-runner:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_MAJOR_VERSION=jdk-11.0.23 -ARG K_JDK_VERSION=11.0.23 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK11U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz +ARG K_JDK_MAJOR_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-11.0.24 +ARG K_JDK_VERSION=11.0.24 +ARG K_JDK_BUILD_VERSION=8 +ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz +ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} - -ENV PATH=$PATH:${JAVA_HOME}/bin:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin +ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 @@ -633,4 +632,6 @@ RUN apt clean -y && \ apt autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/* \ No newline at end of file + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile index a4382b318..74138b31a 100644 --- a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile +++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile @@ -2,16 +2,15 @@ FROM epicmorg/gitlab-runner:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_MAJOR_VERSION=jdk-17.0.11 +ARG K_JDK_MAJOR_VERSION=17 +ARG K_JDK_FULL_VERSION=jdk-17.0.11 ARG K_JDK_VERSION=17.0.11 ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK17U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz +ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz +ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} - -ENV PATH=$PATH:${JAVA_HOME}/bin:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin +ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 @@ -633,4 +632,6 @@ RUN apt clean -y && \ apt autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/* \ No newline at end of file + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk8/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk8/Dockerfile index dd015a9ba..3250eebef 100644 --- a/linux/ecosystem/gitlab/runner/android-sdk/jdk8/Dockerfile +++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk8/Dockerfile @@ -2,16 +2,15 @@ FROM epicmorg/gitlab-runner:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_MAJOR_VERSION=jdk8u412 -ARG K_JDK_VERSION=8u412 -ARG K_JDK_BUILD_VERSION=b08 -ARG K_JDK_URL=https://github.com/adoptium/temurin8-binaries/releases/download/${K_JDK_MAJOR_VERSION}-${K_JDK_BUILD_VERSION}/OpenJDK8U-jdk_x64_linux_hotspot_${K_JDK_VERSION}${K_JDK_BUILD_VERSION}.tar.gz +ARG K_JDK_MAJOR_VERSION=8 +ARG K_JDK_FULL_VERSION=jdk8u422 +ARG K_JDK_VERSION=8u422 +ARG K_JDK_BUILD_VERSION=b05 +ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}${K_JDK_BUILD_VERSION}.tar.gz +ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}${K_JDK_BUILD_VERSION}.tar.gz -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}-${K_JDK_BUILD_VERSION} - -ENV PATH=$PATH:${JAVA_HOME}/bin:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin +ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 @@ -633,4 +632,6 @@ RUN apt clean -y && \ apt autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/* \ No newline at end of file + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/atlassian-sdk/Dockerfile b/linux/ecosystem/gitlab/runner/atlassian-sdk/Dockerfile index 1959cab67..346156997 100644 --- a/linux/ecosystem/gitlab/runner/atlassian-sdk/Dockerfile +++ b/linux/ecosystem/gitlab/runner/atlassian-sdk/Dockerfile @@ -15,9 +15,9 @@ ARG DEBIAN_FRONTEND=noninteractive # # https://community.developer.atlassian.com/t/the-repository-https-packages-atlassian-com-atlassian-sdk-deb-stable-release-is-not-signed/36901 ############################### -RUN curl -fsSL https://packages.atlassian.com/api/gpg/key/public | apt-key add - && \ - echo 'deb [trusted=yes] https://packages.atlassian.com/atlassian-sdk-deb stable contrib' > /etc/apt/sources.list.d/atlassian-sdk.list && \ - apt-get update --allow-insecure-repositories && \ +COPY etc/apt/keyrings/atlassian.asc /etc/apt/keyrings/ +COPY etc/apt/sources.list.d/atlassian-sdk.list /etc/apt/sources.list.d/ +RUN apt-get update --allow-insecure-repositories && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ atlassian-plugin-sdk @@ -30,3 +30,5 @@ RUN apt clean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/atlassian-sdk/apt/keyrings/atlassian.asc b/linux/ecosystem/gitlab/runner/atlassian-sdk/apt/keyrings/atlassian.asc new file mode 100644 index 000000000..c906eb35f --- /dev/null +++ b/linux/ecosystem/gitlab/runner/atlassian-sdk/apt/keyrings/atlassian.asc @@ -0,0 +1,86 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +EncZ +=/56f +-----END PGP PUBLIC KEY BLOCK----- diff --git a/linux/ecosystem/gitlab/runner/atlassian-sdk/apt/sources.list.d/atlassian-sdk.list b/linux/ecosystem/gitlab/runner/atlassian-sdk/apt/sources.list.d/atlassian-sdk.list new file mode 100644 index 000000000..5b81e45ad --- /dev/null +++ b/linux/ecosystem/gitlab/runner/atlassian-sdk/apt/sources.list.d/atlassian-sdk.list @@ -0,0 +1 @@ +deb [trusted=yes signed-by=/etc/apt/keyrings/atlassian.asc] https://packages.atlassian.com/atlassian-sdk-deb stable contrib diff --git a/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile b/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile index a39413f34..c3afcb5fb 100644 --- a/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile +++ b/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile @@ -21,58 +21,37 @@ ENV NUGET_XMLDOC_MODE=skip ENV CLR_OPENSSL_VERSION_OVERRIDE=45 # PowerShell telemetry for docker image usage ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-10 -#Install packages -RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - && \ - echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/debian/12/prod bookworm main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ -# libicu63 \ - liblttng-ust0 \ - libssl1.1 \ - libstdc++6 \ - zlib1g \ -# dotnet-sdk-2.1 \ -# dotnet-runtime-deps-2.1 \ -# dotnet-runtime-2.1 \ -# dotnet-hostfxr-2.1 \ -# dotnet-sdk-3.1 \ -# dotnet-targeting-pack-3.1 \ -# dotnet-runtime-deps-3.1 \ -# dotnet-runtime-3.1 \ -# dotnet-hostfxr-3.1 \ -# dotnet-apphost-pack-3.1 \ -# dotnet-sdk-5.0 \ -# dotnet-targeting-pack-5.0 \ -# dotnet-runtime-deps-5.0 \ -# dotnet-runtime-5.0 \ -# dotnet-hostfxr-5.0 \ -# dotnet-apphost-pack-5.0 \ -# dotnet-sdk-6.0 \ -# dotnet-targeting-pack-6.0 \ -# dotnet-runtime-deps-6.0 \ -# dotnet-runtime-6.0 \ -# dotnet-hostfxr-6.0 \ -# dotnet-apphost-pack-6.0 \ - dotnet-sdk-7.0 \ - dotnet-targeting-pack-7.0 \ - dotnet-runtime-deps-7.0 \ - dotnet-runtime-7.0 \ - dotnet-hostfxr-7.0 \ - dotnet-apphost-pack-7.0 \ - dotnet-host \ - procdump \ -# procmon \ - powershell-preview \ - powershell -# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help && \ - pwsh-preview -v && \ - pwsh -v +ENV DOTNET_CHANNEL=LTS +ENV DOTNET_ROOT=${EMG_LOCAL_BASE_DIR}/dotnet/${DOTNET_CHANNEL} +ARG DOTNET_TOOLS_DIR=${DOTNET_ROOT}/tools +ARG DOTNET_INSTALL_DIR=${DOTNET_ROOT} +ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +ENV DOTNET_CLI_TELEMETRY_OPTOUT=true +ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true + +################################################################## +# installing dotnet +################################################################## +ADD ${DOTNET_INSTALL_SCRIPT_URL} /tmp +RUN mkdir -p ${DOTNET_ROOT} && \ + chmod +x /tmp/dotnet-install.sh && \ + /tmp/dotnet-install.sh --verbose --no-path --install-dir ${DOTNET_ROOT} --channel ${DOTNET_CHANNEL} --version latest + +################################################################## +# Setup $PATH +################################################################## +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} + +################################################################## +# Version after install +################################################################## +RUN echo "=============================================" && \ + echo $(dotnet --info) && \ + echo $(dotnet --list-sdks) && \ + echo $(dotnet --list-runtimes) && \ + echo "=============================================" ################################################################## # Mono @@ -91,13 +70,14 @@ RUN dotnet help && \ # ca-certificates-mono # mono-xsp4 - ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/* + rm -rfv /tmp/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/latest/Dockerfile b/linux/ecosystem/gitlab/runner/latest/Dockerfile index 0ad54631d..5d927f5be 100644 --- a/linux/ecosystem/gitlab/runner/latest/Dockerfile +++ b/linux/ecosystem/gitlab/runner/latest/Dockerfile @@ -13,15 +13,18 @@ RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/c ################################################################## #Install packages -RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \ - echo 'deb https://download.docker.com/linux/debian bookworm test' > /etc/apt/sources.list.d/docker.list && \ - echo 'deb https://download.docker.com/linux/debian bookworm nightly' >> /etc/apt/sources.list.d/docker.list && \ - apt-cache policy docker-ce && \ +RUN install -m 0755 -d /etc/apt/keyrings && \ + curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && \ + chmod a+r /etc/apt/keyrings/docker.asc && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable nightly" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ docker-ce \ docker-ce-cli \ - containerd.io systemd && \ + containerd.io \ + docker-buildx-plugin \ + docker-compose-plugin \ + systemd && \ systemctl disable docker && \ docker --version @@ -43,11 +46,8 @@ RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/d ################################################################## # gitlab runner setup ################################################################## -COPY install-gitlab-runner.sh /tmp/install-gitlab-runner.sh -RUN cd /tmp && \ - chmod +x /tmp/install-gitlab-runner.sh && \ - bash /tmp/install-gitlab-runner.sh && \ -# useradd --comment 'GitLab Runner' --create-home gitlab-runner --shell /bin/bash && \ +ADD https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_amd64.deb /tmp +RUN dpkg -i /tmp/gitlab-runner_amd64.deb && \ usermod -aG docker gitlab-runner && \ cat /etc/passwd && \ gitlab-runner --version diff --git a/linux/ecosystem/gitlab/runner/latest/install-gitlab-runner.sh b/linux/ecosystem/gitlab/runner/latest/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/ecosystem/gitlab/runner/latest/install-gitlab-runner.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -eEo pipefail - -wget --no-check-certificate -c https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_amd64.deb --random-wait -O /tmp/gitlab-runner.deb - -dpkg -i "/tmp/gitlab-runner.deb" -apt-get update -apt-get -f install -y -rm -rfv /var/lib/apt/lists/* -rm -rfv "/tmp/gitlab-runner.deb" diff --git a/linux/ecosystem/gitlab/runner/node0.12/Dockerfile b/linux/ecosystem/gitlab/runner/node0.12/Dockerfile index ae5355466..5b11e07d4 100644 --- a/linux/ecosystem/gitlab/runner/node0.12/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node0.12/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md - -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp + +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md #RUN npm install -g pnpm yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node10/Dockerfile b/linux/ecosystem/gitlab/runner/node10/Dockerfile index 2e72ed018..60a683069 100644 --- a/linux/ecosystem/gitlab/runner/node10/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node10/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@5 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node11/Dockerfile b/linux/ecosystem/gitlab/runner/node11/Dockerfile index 4559ad638..dfbdbd831 100644 --- a/linux/ecosystem/gitlab/runner/node11/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node11/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@5 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node12/Dockerfile b/linux/ecosystem/gitlab/runner/node12/Dockerfile index fa7b803ec..abe1d6f46 100644 --- a/linux/ecosystem/gitlab/runner/node12/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node12/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@6 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node13/Dockerfile b/linux/ecosystem/gitlab/runner/node13/Dockerfile index 59cc615de..ab4aa56fd 100644 --- a/linux/ecosystem/gitlab/runner/node13/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node13/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@6 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/node14/Dockerfile b/linux/ecosystem/gitlab/runner/node14/Dockerfile index 35cd0a0a3..87f74657d 100644 --- a/linux/ecosystem/gitlab/runner/node14/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node14/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@7 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node15/Dockerfile b/linux/ecosystem/gitlab/runner/node15/Dockerfile index 1b4454946..6eb112e50 100644 --- a/linux/ecosystem/gitlab/runner/node15/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node15/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md #RUN npm install -g pnpm yarn RUN npm install -g yarn @@ -45,3 +43,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node16/Dockerfile b/linux/ecosystem/gitlab/runner/node16/Dockerfile index 938a0f5fd..27812e063 100644 --- a/linux/ecosystem/gitlab/runner/node16/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node16/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md #RUN npm install -g pnpm yarn RUN npm install -g yarn @@ -45,3 +43,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node17/Dockerfile b/linux/ecosystem/gitlab/runner/node17/Dockerfile index 93e23c090..bedba1358 100644 --- a/linux/ecosystem/gitlab/runner/node17/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node17/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md #RUN npm install -g pnpm yarn RUN npm install -g yarn @@ -45,3 +43,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node18/Dockerfile b/linux/ecosystem/gitlab/runner/node18/Dockerfile index ab98b9350..e50bef009 100644 --- a/linux/ecosystem/gitlab/runner/node18/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node18/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=18 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.3 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.4 ARG K_NODE_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE_VERSION}-linux-x64.tar.gz ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE_VERSION}-headers.tar.gz @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node19/Dockerfile b/linux/ecosystem/gitlab/runner/node19/Dockerfile index 1537634b3..60f2a881e 100644 --- a/linux/ecosystem/gitlab/runner/node19/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node19/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node20/Dockerfile b/linux/ecosystem/gitlab/runner/node20/Dockerfile index 97372a297..ec9fdb7a9 100644 --- a/linux/ecosystem/gitlab/runner/node20/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node20/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=20 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.15.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.16.0 ARG K_NODE_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE_VERSION}-linux-x64.tar.gz ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE_VERSION}-headers.tar.gz @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node21/Dockerfile b/linux/ecosystem/gitlab/runner/node21/Dockerfile index a9b7cc46d..2e3f5a793 100644 --- a/linux/ecosystem/gitlab/runner/node21/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node21/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node22/Dockerfile b/linux/ecosystem/gitlab/runner/node22/Dockerfile index e47df9681..9d83a53df 100644 --- a/linux/ecosystem/gitlab/runner/node22/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node22/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=22 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.3.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 ARG K_NODE_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE_VERSION}-linux-x64.tar.gz ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE_VERSION}-headers.tar.gz @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node4/Dockerfile b/linux/ecosystem/gitlab/runner/node4/Dockerfile index 16b38b47a..88e25a59f 100644 --- a/linux/ecosystem/gitlab/runner/node4/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node4/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md - -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp + +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md #RUN npm install -g pnpm yarn RUN npm install -g pnpm@2 @@ -45,3 +43,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node5/Dockerfile b/linux/ecosystem/gitlab/runner/node5/Dockerfile index efa31d4ce..cc48adf14 100644 --- a/linux/ecosystem/gitlab/runner/node5/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node5/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md - -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp + +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md #RUN npm install -g pnpm yarn RUN npm install -g pnpm@2 @@ -45,3 +43,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node6/Dockerfile b/linux/ecosystem/gitlab/runner/node6/Dockerfile index 3a93eb428..1d8ac7e79 100644 --- a/linux/ecosystem/gitlab/runner/node6/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node6/Dockerfile @@ -1,8 +1,6 @@ FROM epicmorg/gitlab-runner:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - ARG K_NODE_MAJOR_VERSION=6 ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.17.1 ARG K_NODE_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE_VERSION}-linux-x64.tar.gz @@ -14,14 +12,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md - -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp + +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md #RUN npm install -g pnpm yarn RUN npm install -g pnpm@2 @@ -45,3 +41,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node7/Dockerfile b/linux/ecosystem/gitlab/runner/node7/Dockerfile index 544676c51..e78065000 100644 --- a/linux/ecosystem/gitlab/runner/node7/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node7/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@3 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node8/Dockerfile b/linux/ecosystem/gitlab/runner/node8/Dockerfile index d82c5edcc..fe14f0088 100644 --- a/linux/ecosystem/gitlab/runner/node8/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node8/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@3 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/node9/Dockerfile b/linux/ecosystem/gitlab/runner/node9/Dockerfile index 3e2e1f8ec..c2e9e4c5b 100644 --- a/linux/ecosystem/gitlab/runner/node9/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node9/Dockerfile @@ -14,14 +14,12 @@ ARG K_NODE_HEADERS_URL=https://nodejs.org/dist/v${K_NODE_VERSION}/node-v${K_NODE RUN groupadd -g 1337 node && \ useradd -u 1337 --gid node --shell /bin/bash --create-home node -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ && \ - rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md +ADD ${K_NODE_URL} /tmp +ADD ${K_NODE_HEADERS_URL} /tmp -RUN curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --location ${K_NODE_HEADERS_URL}?$(date +%s) \ - --header 'Cache-Control: no-cache, no-store' \ - --header 'Pragma: no-cache' | tar xzv --strip-components=1 --directory /usr/local/ +RUN tar -xvzf /tmp/node-v${K_NODE_VERSION}-linux-x64.tar.gz --strip-components=1 --directory /usr/local && \ + tar -xvzf /tmp/node-v${K_NODE_VERSION}-headers.tar.gz --strip-components=1 --directory /usr/local && \ + rm -rfv /usr/local/CHANGELOG.md /usr/local/LICENSE /usr/local/README.md RUN npm install -g pnpm@3 yarn @@ -44,3 +42,5 @@ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/steam-sdk/Dockerfile b/linux/ecosystem/gitlab/runner/steam-sdk/Dockerfile deleted file mode 100644 index a9170ed5d..000000000 --- a/linux/ecosystem/gitlab/runner/steam-sdk/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM epicmorg/gitlab-runner:latest -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# steam runtime and ssdk -################################################################## -RUN cd / && \ - sudo mkdir valve && \ - cd valve && \ - sudo wget http://media.steampowered.com/client/runtime/steam-runtime-sdk_latest.tar.xz && \ - sudo tar xvf steam-runtime-sdk_latest.tar.xz && \ - sudo mv steam-runtime-sdk_2013-09-05 steam-runtime && \ - sudo chown root:root * -R && \ - cd steam-runtime && \ - printf '%s\n' 3 1 Y Y Y | ./setup.sh - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/* diff --git a/linux/ecosystem/gitlab/runner/steam-sdk/Makefile b/linux/ecosystem/gitlab/runner/steam-sdk/Makefile deleted file mode 100644 index 06e855b50..000000000 --- a/linux/ecosystem/gitlab/runner/steam-sdk/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/ecosystem/gitlab/runner/steam-sdk/README.md b/linux/ecosystem/gitlab/runner/steam-sdk/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/ecosystem/gitlab/runner/steam-sdk/docker-compose.yml b/linux/ecosystem/gitlab/runner/steam-sdk/docker-compose.yml deleted file mode 100644 index 5cc3d8a42..000000000 --- a/linux/ecosystem/gitlab/runner/steam-sdk/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/gitlab-runner:steam-sdk" - build: - context: . diff --git a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile index cea225e75..277b6f505 100644 --- a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile @@ -40,7 +40,7 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## #Install base packages -RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.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' RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ diff --git a/linux/ecosystem/teamcity/agent/latest/Dockerfile b/linux/ecosystem/teamcity/agent/latest/Dockerfile index 580d592bd..a99999db1 100644 --- a/linux/ecosystem/teamcity/agent/latest/Dockerfile +++ b/linux/ecosystem/teamcity/agent/latest/Dockerfile @@ -39,7 +39,7 @@ RUN useradd -m buildagent && \ RUN install -m 0755 -d /etc/apt/keyrings && \ curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && \ chmod a+r /etc/apt/keyrings/docker.asc && \ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable nightly" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ docker-ce \ @@ -49,7 +49,8 @@ RUN install -m 0755 -d /etc/apt/keyrings && \ docker-compose-plugin \ systemd && \ systemctl disable docker && \ - usermod -aG docker buildagent + usermod -aG docker buildagent && \ + docker --version # A better fix for TW-52939 Dockerfile build fails because of aufs VOLUME /var/lib/docker diff --git a/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk11 b/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk11 index ac66e8f46..7830ca269 100644 --- a/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk11 @@ -39,7 +39,7 @@ RUN useradd -m buildagent && \ RUN install -m 0755 -d /etc/apt/keyrings && \ curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && \ chmod a+r /etc/apt/keyrings/docker.asc && \ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable nightly" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ docker-ce \ diff --git a/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk17 b/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk17 index 8fab4f74a..1c807f815 100644 --- a/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk17 +++ b/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk17 @@ -39,7 +39,7 @@ RUN useradd -m buildagent && \ RUN install -m 0755 -d /etc/apt/keyrings && \ curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && \ chmod a+r /etc/apt/keyrings/docker.asc && \ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable nightly" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ docker-ce \ diff --git a/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk21 b/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk21 index aa9835316..cfb4a16b2 100644 --- a/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk21 +++ b/linux/ecosystem/teamcity/agent/latest/Dockerfile.jdk21 @@ -39,7 +39,7 @@ RUN useradd -m buildagent && \ RUN install -m 0755 -d /etc/apt/keyrings && \ curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && \ chmod a+r /etc/apt/keyrings/docker.asc && \ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable nightly" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ docker-ce \