diff --git a/.github/workflows/_disabled/docker-linux-master.yml.txt b/.github/workflows/_disabled/docker-linux-master.yml.txt index 2b8b299ba..28d86c1bf 100644 --- a/.github/workflows/_disabled/docker-linux-master.yml.txt +++ b/.github/workflows/_disabled/docker-linux-master.yml.txt @@ -4,8 +4,8 @@ on: push: branches: - 'master' - schedule: - - cron: '00 00 * * 6' # At 12:00 AM, only on Saturday +# schedule: +# - cron: '00 00 * * 6' # At 12:00 AM, only on Saturday jobs: diff --git a/.github/workflows/_disabled/docker-win32-master.yml.txt b/.github/workflows/_disabled/docker-win32-master.yml.txt index 4df386f6b..752790702 100644 --- a/.github/workflows/_disabled/docker-win32-master.yml.txt +++ b/.github/workflows/_disabled/docker-win32-master.yml.txt @@ -4,8 +4,8 @@ on: push: branches: - 'master' - schedule: - - cron: '00 00 * * 6' # At 12:00 AM, only on Saturday +# schedule: +# - cron: '00 00 * * 6' # At 12:00 AM, only on Saturday jobs: diff --git a/.github/workflows/_disabled/epicmorg.advanced.python.yml.txt b/.github/workflows/_disabled/epicmorg.advanced.python.yml.txt index 6131e925f..9070faadc 100644 --- a/.github/workflows/_disabled/epicmorg.advanced.python.yml.txt +++ b/.github/workflows/_disabled/epicmorg.advanced.python.yml.txt @@ -2,8 +2,8 @@ name: EpicMorg Advanced Debian Python Images on: workflow_dispatch: - schedule: - - cron: '1 1 * * 1,3,5' +# schedule: +# - cron: '1 1 * * 1,3,5' jobs: diff --git a/.github/workflows/_disabled/epicmorg.ecosysctem.freegpt.images.yml.txt b/.github/workflows/_disabled/epicmorg.ecosysctem.freegpt.images.yml.txt index 1eec6e984..89fa76229 100644 --- a/.github/workflows/_disabled/epicmorg.ecosysctem.freegpt.images.yml.txt +++ b/.github/workflows/_disabled/epicmorg.ecosysctem.freegpt.images.yml.txt @@ -1,8 +1,8 @@ name: EpicMorg EcoSystem FreeGPT Images on: - schedule: - - cron: '0 0 * * 2,4,6' +# schedule: +# - cron: '0 0 * * 2,4,6' jobs: diff --git a/.github/workflows/epicmorg.base.images.current.atlassian.yml b/.github/workflows/epicmorg.base.images.current.atlassian.yml index 0c190ccfd..42e416201 100644 --- a/.github/workflows/epicmorg.base.images.current.atlassian.yml +++ b/.github/workflows/epicmorg.base.images.current.atlassian.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Atlassian Main Images on: workflow_dispatch: - schedule: - - cron: '5 5 * * 1,3,5' +# schedule: +# - cron: '5 5 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.10.yml b/.github/workflows/epicmorg.base.images.debian.10.yml index a8f57982c..7d638a8da 100644 --- a/.github/workflows/epicmorg.base.images.debian.10.yml +++ b/.github/workflows/epicmorg.base.images.debian.10.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 10 Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' +# schedule: +# - cron: '0 0 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.11.yml b/.github/workflows/epicmorg.base.images.debian.11.yml index dd09972a0..258f8dc67 100644 --- a/.github/workflows/epicmorg.base.images.debian.11.yml +++ b/.github/workflows/epicmorg.base.images.debian.11.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 11 Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' +# schedule: +# - cron: '0 0 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.12.yml b/.github/workflows/epicmorg.base.images.debian.12.yml index 5831e813f..f7da1fa3e 100644 --- a/.github/workflows/epicmorg.base.images.debian.12.yml +++ b/.github/workflows/epicmorg.base.images.debian.12.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 12 Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' +# schedule: +# - cron: '0 0 * * 1,3,5' env: BUILDAH_FORMAT: docker diff --git a/.github/workflows/epicmorg.base.images.debian.13.yml b/.github/workflows/epicmorg.base.images.debian.13.yml index ebe7546c2..9f963f59d 100644 --- a/.github/workflows/epicmorg.base.images.debian.13.yml +++ b/.github/workflows/epicmorg.base.images.debian.13.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 13 Images on: workflow_dispatch: - schedule: - - cron: '1 1 * * 1,3,5' +# schedule: +# - cron: '1 1 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.6.yml b/.github/workflows/epicmorg.base.images.debian.6.yml index 9d1492342..5c33878ad 100644 --- a/.github/workflows/epicmorg.base.images.debian.6.yml +++ b/.github/workflows/epicmorg.base.images.debian.6.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 6 Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' +# schedule: +# - cron: '0 0 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.7.yml b/.github/workflows/epicmorg.base.images.debian.7.yml index 09c8efe35..1ce53516a 100644 --- a/.github/workflows/epicmorg.base.images.debian.7.yml +++ b/.github/workflows/epicmorg.base.images.debian.7.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 7 Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' +# schedule: +# - cron: '0 0 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.8.yml b/.github/workflows/epicmorg.base.images.debian.8.yml index 9975845e0..afe84edaa 100644 --- a/.github/workflows/epicmorg.base.images.debian.8.yml +++ b/.github/workflows/epicmorg.base.images.debian.8.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 8 Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' +# schedule: +# - cron: '0 0 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.9.yml b/.github/workflows/epicmorg.base.images.debian.9.yml index 57dfcb298..d287d4a1b 100644 --- a/.github/workflows/epicmorg.base.images.debian.9.yml +++ b/.github/workflows/epicmorg.base.images.debian.9.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian 9 Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' +# schedule: +# - cron: '0 0 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.debian.sid.yml b/.github/workflows/epicmorg.base.images.debian.sid.yml index 455d2d0bb..976fd3994 100644 --- a/.github/workflows/epicmorg.base.images.debian.sid.yml +++ b/.github/workflows/epicmorg.base.images.debian.sid.yml @@ -2,8 +2,8 @@ name: EpicMorg Debian SID Images on: workflow_dispatch: - schedule: - - cron: '2 2 * * 1,3,5' +# schedule: +# - cron: '2 2 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.giltab.runners.yml b/.github/workflows/epicmorg.base.images.giltab.runners.yml index 6ffc281c2..07389a56f 100644 --- a/.github/workflows/epicmorg.base.images.giltab.runners.yml +++ b/.github/workflows/epicmorg.base.images.giltab.runners.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Gitlab Runner Images on: workflow_dispatch: - schedule: - - cron: '4 5 * * 2,4,6' +# schedule: +# - cron: '4 5 * * 2,4,6' jobs: diff --git a/.github/workflows/epicmorg.base.images.perforce.yml b/.github/workflows/epicmorg.base.images.perforce.yml index be7fce96e..0911e919c 100644 --- a/.github/workflows/epicmorg.base.images.perforce.yml +++ b/.github/workflows/epicmorg.base.images.perforce.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Perfocre Images on: workflow_dispatch: - schedule: - - cron: '4 4 * * 1,3,5' +# schedule: +# - cron: '4 4 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.postgresql.yml b/.github/workflows/epicmorg.base.images.postgresql.yml index 13e4ceb6b..48bf0a0ff 100644 --- a/.github/workflows/epicmorg.base.images.postgresql.yml +++ b/.github/workflows/epicmorg.base.images.postgresql.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem PostgreSQL Images on: workflow_dispatch: - schedule: - - cron: '5 5 * * 1,3,5' +# schedule: +# - cron: '5 5 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.teamcity.agents.yml b/.github/workflows/epicmorg.base.images.teamcity.agents.yml index 69d67585b..25ef935d9 100644 --- a/.github/workflows/epicmorg.base.images.teamcity.agents.yml +++ b/.github/workflows/epicmorg.base.images.teamcity.agents.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem TeamCity Agents Images on: workflow_dispatch: - schedule: - - cron: '4 4 * * 2,4,6' +# schedule: +# - cron: '4 4 * * 2,4,6' jobs: diff --git a/.github/workflows/epicmorg.base.images.testrail.yml b/.github/workflows/epicmorg.base.images.testrail.yml index 4dae92667..184334f99 100644 --- a/.github/workflows/epicmorg.base.images.testrail.yml +++ b/.github/workflows/epicmorg.base.images.testrail.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Testrail Images on: workflow_dispatch: - schedule: - - cron: '4 4 * * 1,3,5' +# schedule: +# - cron: '4 4 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.base.images.web.yml b/.github/workflows/epicmorg.base.images.web.yml index 6076047e4..7490c38ea 100644 --- a/.github/workflows/epicmorg.base.images.web.yml +++ b/.github/workflows/epicmorg.base.images.web.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Web Images on: workflow_dispatch: - schedule: - - cron: '2 2 * * 1,3,5' +# schedule: +# - cron: '2 2 * * 1,3,5' jobs: diff --git a/.github/workflows/epicmorg.ecosysctem.misc.images.yml b/.github/workflows/epicmorg.ecosysctem.misc.images.yml index b86c8d9b6..034cd0721 100644 --- a/.github/workflows/epicmorg.ecosysctem.misc.images.yml +++ b/.github/workflows/epicmorg.ecosysctem.misc.images.yml @@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Misc Images on: workflow_dispatch: - schedule: - - cron: '0 0 * * 2,4,6' +# schedule: +# - cron: '0 0 * * 2,4,6' jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 085b80ba4..d04f1d10c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Changelog * `apr` - * changed default docker regitstry hub to own. only for ci builds. + * updated `php` images with `ioncube` module.git a + * changed default docker regitstry hub to `own`. only for ci builds. + * updated `nodejs` + * updated `jdk` + * added new `openssl` version `3.5.0` `lts` + * added various versions of `cmake` + * updated `go` + * added more flutter compablity + * added `qbittorrent` + * updated `python` + * updated `gitlab-runner` ## 2025 * `mar` * updated `teamcity-server` iamge diff --git a/Makefile b/Makefile index bcbbe1eb1..be2709e6d 100644 --- a/Makefile +++ b/Makefile @@ -126,11 +126,11 @@ advanced-teamcity-server-images: cd `pwd`/linux/advanced/teamcity/server/latest && pwd && make build && make deploy cd `pwd`/linux/advanced/teamcity/server/2025.03 && pwd && make build && make deploy cd `pwd`/linux/advanced/teamcity/server/2024.12 && pwd && make build && make deploy -# cd `pwd`/linux/advanced/teamcity/server/2024.07.3 && pwd && make build && make deploy -# cd `pwd`/linux/advanced/teamcity/server/2024.03.3 && pwd && make build && make deploy -# cd `pwd`/linux/advanced/teamcity/server/2023.05.6 && pwd && make build && make deploy -# cd `pwd`/linux/advanced/teamcity/server/2022.10.6 && pwd && make build && make deploy -# cd `pwd`/linux/advanced/teamcity/server/2022.04.7 && pwd && make build && make deploy + cd `pwd`/linux/advanced/teamcity/server/2024.07.3 && pwd && make build && make deploy + cd `pwd`/linux/advanced/teamcity/server/2024.03.3 && pwd && make build && make deploy + cd `pwd`/linux/advanced/teamcity/server/2023.05.6 && pwd && make build && make deploy + cd `pwd`/linux/advanced/teamcity/server/2022.10.6 && pwd && make build && make deploy + cd `pwd`/linux/advanced/teamcity/server/2022.04.7 && pwd && make build && make deploy #################################################################################################################### @@ -353,17 +353,16 @@ ecosystem-images: make bundle-base-images make ecosystem-php-images make ecosystem-apache2-images - make ecosystem-testrail-imagesmake ecosystem-testrail-images + make ecosystem-testrail-images make ecosystem-torrserver-images - make ecosystem-images make ecosystem-qbittorrent-images make ecosystem-vk2discord-images make ecosystem-postgres-images make ecosystem-teamcity-agent-images - make ecosystem-gitlab-runner-images +# make ecosystem-gitlab-runner-images make ecosystem-nginx-images make advanced-vscode-server-images - make ecosystem-ninjam-image + make ecosystem-ninjam-images make bundle-jira make bundle-atlassian-latest @@ -787,6 +786,8 @@ ecosystem-debian-bookworm-jdk-images: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23 && pwd && make build && make deploy @make clean + cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk && pwd && make build && make deploy + @make clean ecosystem-debian-bookworm-nodejs-images: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current && pwd && make build && make deploy @@ -1272,7 +1273,7 @@ ecosystem-torrserver-images: ecosystem-electron-release-server-images: cd `pwd`/linux/ecosystem/electron-release-server && pwd && make build && make deploy -ecosystem-ninjam-image: +ecosystem-ninjam-images: cd `pwd`/linux/ecosystem/ninjam/latest && pwd && make build && make deploy ecosystem-vk2discord-images: @@ -1303,6 +1304,8 @@ ecosystem-qbittorrent-images: cd `pwd`/linux/ecosystem/qbittorrent/5.0.0 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/qbittorrent/5.0.1 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/qbittorrent/5.0.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/qbittorrent/5.0.3 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/qbittorrent/5.0.4 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/qbittorrent/testing && pwd && make build && make deploy @make clean @@ -1347,9 +1350,83 @@ ecosystem-postgres-images: ecosystem-teamcity-agent-images: cd `pwd`/linux/ecosystem/teamcity/agent/minimal && pwd && make build && make deploy cd `pwd`/linux/ecosystem/teamcity/agent/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/amxx-sdk/1.9 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/amxx-sdk/1.10 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/android-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/atlassian-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node0.12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node5 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node7 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node8 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node9 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node10 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node19 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node20 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node21 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node22 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node23 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php56 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php70 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php71 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php72 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php73 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php74 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php80 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php81 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php82 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php83 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php84 && pwd && make build && make deploy ecosystem-gitlab-runner-images: + cd `pwd`/linux/ecosystem/gitlab/runner/minimal && pwd && make build && make deploy cd `pwd`/linux/ecosystem/gitlab/runner/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/amxx-sdk/1.9 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/amxx-sdk/1.10 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/android-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/atlassian-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/dotnet-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node0.12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node5 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node7 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node8 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node9 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node10 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/node19 && pwd && make build && make deploy + 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/node23 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php56 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php70 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php71 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php72 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php73 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php74 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php80 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php81 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php82 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php83 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/gitlab/runner/php84 && 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/advanced/vscode-server/amxx/1.10/Dockerfile b/linux/advanced/vscode-server/amxx/1.10/Dockerfile index 2651a1a20..203d65511 100644 --- a/linux/advanced/vscode-server/amxx/1.10/Dockerfile +++ b/linux/advanced/vscode-server/amxx/1.10/Dockerfile @@ -25,29 +25,29 @@ ENV BuildDocker true # # Install packages ENV AMXX_VERSION=1.10 -ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION -ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting -ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include -ENV PATH=$PATH:$AMXX_BIN_PATH -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} COPY inc.tar /tmp RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \ - mkdir -p $AMXX_INSTALL_PATH && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ - mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ - chmod +x $AMXX_BIN_PATH/amxxpc && \ - tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ - chmod -R 700 $AMXX_INC_PATH && \ - chmod +x $AMXX_BIN_PATH/compile.sh + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chmod -R 700 ${AMXX_INC_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /tmp/mc.patch && \ rm -rfv /var/cache/apt/archives/*.deb && \ diff --git a/linux/advanced/vscode-server/amxx/1.9/Dockerfile b/linux/advanced/vscode-server/amxx/1.9/Dockerfile index 4db9968d3..7429f5363 100644 --- a/linux/advanced/vscode-server/amxx/1.9/Dockerfile +++ b/linux/advanced/vscode-server/amxx/1.9/Dockerfile @@ -25,29 +25,29 @@ ENV BuildDocker true # # Install packages ENV AMXX_VERSION=1.9 -ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION -ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting -ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include -ENV PATH=$PATH:$AMXX_BIN_PATH -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} COPY inc.tar /tmp RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \ - mkdir -p $AMXX_INSTALL_PATH && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ - mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ - tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ - chmod -R 700 $AMXX_INC_PATH && \ - chmod +x $AMXX_BIN_PATH/amxxpc && \ - chmod +x $AMXX_BIN_PATH/compile.sh + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chmod -R 700 ${AMXX_INC_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /tmp/mc.patch && \ rm -rfv /var/cache/apt/archives/*.deb && \ diff --git a/linux/advanced/vscode-server/android/Dockerfile b/linux/advanced/vscode-server/android/Dockerfile index 187c46338..8df3e59f4 100644 --- a/linux/advanced/vscode-server/android/Dockerfile +++ b/linux/advanced/vscode-server/android/Dockerfile @@ -7,34 +7,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ################################################################## -# ARGuments +# installing java17 ################################################################## -ENV BuildDocker true - -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk - -################################################################## -# installing java11 -################################################################## -ARG K_JDK_MAJOR_VERSION=11 -ARG K_JDK_FULL_VERSION=jdk-11.0.26 -ARG K_JDK_VERSION=11.0.26 -ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_MAJOR_VERSION=17 +ARG K_JDK_FULL_VERSION=jdk-17.0.13 +ARG K_JDK_VERSION=17.0.13 +ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin -################################################################## -# installing java11 -################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings @@ -107,18 +107,51 @@ RUN chmod +x -R ${KNPL_BIN} ################################################################## # Android SDK ################################################################## +ENV ANDROID_HOME=${EMG_LOCAL_BASE_DIR}/android/sdk +ENV ANDROID_SDK_ROOT=${ANDROID_HOME} + RUN apt-get update && \ apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ android-sdk \ + sdkmanager \ android-sdk-build-tools \ android-sdk-platform-tools-common \ android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 + adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ + mkdir -p ${ANDROID_HOME} && \ + sdkmanager --version && \ + gradle -v && \ + mvn -v -################################################################## -# Activate Android SDK -################################################################## -RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license +RUN sdkmanager --install --verbose \ + "cmake;3.22.1" \ +# + "cmdline-tools;latest" \ +# + "tools" \ +# + "platform-tools" \ +# + "platforms;android-21" \ + "platforms;android-34" \ + "platforms;android-35" \ +# + "build-tools;21.1.2" \ + "build-tools;34.0.0" \ + "build-tools;35.0.0" \ +# + "extras;android;m2repository" \ +# + "ndk;25.1.8937393" \ + "ndk;25.2.9519653" + +ENV PATH="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/tools/proguard/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH}" + +# Activate android sdk +RUN yes | sdkmanager --licenses && \ + flutter doctor && \ + yes | sdkmanager --licenses && \ + flutter doctor -v ################################################################## # Cleanup diff --git a/linux/advanced/vscode-server/android/docker-compose.yml b/linux/advanced/vscode-server/android/docker-compose.yml index c9fc85b01..effe0f043 100644 --- a/linux/advanced/vscode-server/android/docker-compose.yml +++ b/linux/advanced/vscode-server/android/docker-compose.yml @@ -3,18 +3,7 @@ services: image: "hub.epicm.org/epicmorg/vscode-server:android" build: context: . - app-jdk11: - image: "hub.epicm.org/epicmorg/vscode-server:android-jdk11" - build: - context: . - - app-jdk8: - image: "hub.epicm.org/epicmorg/vscode-server:android-jdk8" - build: - context: . - dockerfile: ./Dockerfile.jdk8 app-jdk17: image: "hub.epicm.org/epicmorg/debian:bookworm-develop-jdk17" build: context: . - dockerfile: ./Dockerfile.jdk17 diff --git a/linux/advanced/vscode-server/cpp/Dockerfile b/linux/advanced/vscode-server/cpp/Dockerfile index da907cc5a..71e5e30c1 100644 --- a/linux/advanced/vscode-server/cpp/Dockerfile +++ b/linux/advanced/vscode-server/cpp/Dockerfile @@ -18,14 +18,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -40,7 +82,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -66,17 +108,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile index ab6d9371c..554d7542b 100644 --- a/linux/advanced/vscode-server/devops/Dockerfile +++ b/linux/advanced/vscode-server/devops/Dockerfile @@ -59,6 +59,7 @@ ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin # steam runtime sdk @@ -68,14 +69,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -90,7 +133,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -111,23 +154,23 @@ ARG GO_TEMP=/tmp/go${GO_VERSION}.linux-amd64.tar.gz # # Install packages ENV AMXX_VERSION=1.10 -ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION -ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting -ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include -ENV PATH=$PATH:$AMXX_BIN_PATH -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} COPY inc.tar /tmp RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \ - mkdir -p $AMXX_INSTALL_PATH && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ - mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ - chmod +x $AMXX_BIN_PATH/amxxpc && \ - tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ - chmod -R 700 $AMXX_INC_PATH && \ - chmod +x $AMXX_BIN_PATH/compile.sh + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chmod -R 700 ${AMXX_INC_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh ################################################################## # Rust compillers @@ -149,17 +192,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ diff --git a/linux/ecosystem/apache2/php5.5/Dockerfile b/linux/ecosystem/apache2/php5.5/Dockerfile index 2b822a4f8..c1d71ffba 100644 --- a/linux/ecosystem/apache2/php5.5/Dockerfile +++ b/linux/ecosystem/apache2/php5.5/Dockerfile @@ -92,8 +92,8 @@ RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.5.so" >> ${P ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php5.6/Dockerfile b/linux/ecosystem/apache2/php5.6/Dockerfile index 7dcd2b03a..e20167d0c 100644 --- a/linux/ecosystem/apache2/php5.6/Dockerfile +++ b/linux/ecosystem/apache2/php5.6/Dockerfile @@ -116,8 +116,8 @@ RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.6.so" >> ${P ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php7.0/Dockerfile b/linux/ecosystem/apache2/php7.0/Dockerfile index 10bd48ced..4da83a58c 100644 --- a/linux/ecosystem/apache2/php7.0/Dockerfile +++ b/linux/ecosystem/apache2/php7.0/Dockerfile @@ -130,8 +130,8 @@ RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php7.1/Dockerfile b/linux/ecosystem/apache2/php7.1/Dockerfile index b1a109519..cad44fdb9 100644 --- a/linux/ecosystem/apache2/php7.1/Dockerfile +++ b/linux/ecosystem/apache2/php7.1/Dockerfile @@ -130,8 +130,8 @@ RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php7.2/Dockerfile b/linux/ecosystem/apache2/php7.2/Dockerfile index 982f6450d..6b44bb980 100644 --- a/linux/ecosystem/apache2/php7.2/Dockerfile +++ b/linux/ecosystem/apache2/php7.2/Dockerfile @@ -130,8 +130,8 @@ RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php7.3/Dockerfile b/linux/ecosystem/apache2/php7.3/Dockerfile index ff5586470..e790aeb61 100644 --- a/linux/ecosystem/apache2/php7.3/Dockerfile +++ b/linux/ecosystem/apache2/php7.3/Dockerfile @@ -131,8 +131,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php7.4/Dockerfile b/linux/ecosystem/apache2/php7.4/Dockerfile index d3eec46bb..600efb4f0 100644 --- a/linux/ecosystem/apache2/php7.4/Dockerfile +++ b/linux/ecosystem/apache2/php7.4/Dockerfile @@ -137,8 +137,8 @@ RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php8.0/Dockerfile b/linux/ecosystem/apache2/php8.0/Dockerfile index 219e74d1d..50ffc3f37 100644 --- a/linux/ecosystem/apache2/php8.0/Dockerfile +++ b/linux/ecosystem/apache2/php8.0/Dockerfile @@ -139,8 +139,8 @@ RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php8.1/Dockerfile b/linux/ecosystem/apache2/php8.1/Dockerfile index 6e0b4e524..4729ebfe2 100644 --- a/linux/ecosystem/apache2/php8.1/Dockerfile +++ b/linux/ecosystem/apache2/php8.1/Dockerfile @@ -131,8 +131,8 @@ RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php8.2/Dockerfile b/linux/ecosystem/apache2/php8.2/Dockerfile index e9d3da5d0..2e620c218 100644 --- a/linux/ecosystem/apache2/php8.2/Dockerfile +++ b/linux/ecosystem/apache2/php8.2/Dockerfile @@ -131,8 +131,8 @@ RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php8.3/Dockerfile b/linux/ecosystem/apache2/php8.3/Dockerfile index 101650b06..7c5481e8d 100644 --- a/linux/ecosystem/apache2/php8.3/Dockerfile +++ b/linux/ecosystem/apache2/php8.3/Dockerfile @@ -131,8 +131,8 @@ RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/apache2/php8.4/Dockerfile b/linux/ecosystem/apache2/php8.4/Dockerfile index 74a21bcf2..9fdcf634b 100644 --- a/linux/ecosystem/apache2/php8.4/Dockerfile +++ b/linux/ecosystem/apache2/php8.4/Dockerfile @@ -131,8 +131,8 @@ RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk11 index 864753ab0..71e5463e7 100644 --- a/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk11 @@ -37,8 +37,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk17 index 4caf5c726..3a61cdcf4 100644 --- a/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/bitbucket/8/8.17.0/Dockerfile.jdk17 @@ -37,8 +37,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk11 index 587d462c5..5cf0b024e 100644 --- a/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk11 @@ -37,8 +37,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk17 b/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk17 index e3ed7b20b..c121497c4 100644 --- a/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/bitbucket/8/8.19.6/Dockerfile.jdk17 @@ -36,8 +36,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk11 index 4c678f96b..f66a38542 100644 --- a/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk11 @@ -36,8 +36,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk17 index 0fbcacf1f..6094131df 100644 --- a/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/bitbucket/9/9.0.0/Dockerfile.jdk17 @@ -36,8 +36,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile index aedbff503..d74f9f44f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile @@ -36,8 +36,8 @@ RUN mkdir -p ${JIRA_INSTALL_DIR} \ && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile index aedbff503..d74f9f44f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile @@ -36,8 +36,8 @@ RUN mkdir -p ${JIRA_INSTALL_DIR} \ && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile index 1c2f6beb8..391d84f71 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile.develop index 375f386a0..1e1bbdc12 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile index d13bbafd3..8ac59d57b 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile.develop index 8589b141b..947a34acd 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile index a408e0588..94d9e7aee 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile.develop index 9b35a6753..604d87fb3 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile index 027847fd6..778821f7b 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile.develop index f488dd9ea..cdd67418f 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile index 83f31a9da..682c4117e 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile.develop index 4172a0652..8af142768 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile index 9ee0bb072..70081b6fb 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:squeeze LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile.develop index 4da015517..bebbef404 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:squeeze-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile index 2fa830832..67ec939d5 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:squeeze LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile.develop index d0ba5a18c..80e299dec 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:squeeze-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile index 8fafe6d1a..e93ad93c1 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile.develop index 75a202e45..6cf1e6c8e 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile index 600d5a86f..1d953f8d0 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile.develop index d1611c424..5f4bd1670 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile index 719ae3797..04832a43b 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile.develop index efaa0519b..dceee7588 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile index 96f01bc17..07e645647 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile.develop index b8f534673..1f2a0a2bb 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile index 303a630be..3c74086ed 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile.develop index c74114ccc..d8ff9ee34 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile index e0c984055..c9b8c1ef8 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile.develop index 12c20c267..97aa53f1d 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile index 893b40d9b..bc7e472c8 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:wheezy LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile.develop index 2c54fcd0d..29fafd885 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:wheezy-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile index 8499e8f0e..3548a9b67 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:wheezy LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile.develop index 3d5d20a7e..1516f0b47 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:wheezy-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile index 4d8de4670..1d99c3ebb 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile.develop index 978a3bd1a..fdb64a164 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile index 1573d4cbb..7696ae695 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile @@ -15,14 +15,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -37,7 +79,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -151,17 +193,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile index 6a5e7f436..9417ebddb 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile.develop index 3f4958d15..0a098e872 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile index e9a3768e0..534cf1b05 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile.develop index 147c00a4a..4fb493d65 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile index 424ae7dfd..d46deb39d 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile.develop index ff53acb18..fd2205435 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile index ba71cf922..6fff2b52c 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile.develop index ec4e75a4e..84becde07 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile index c12cf38d3..0d8c24665 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile.develop index 6dd884393..e86bef387 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile index dfbb5c527..41c5254dd 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile.develop index 539ed29fc..46c283516 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk20/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile index 27cd0ab2b..fc4adcef1 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile.develop index 70eada2d7..c8ff80e24 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk21/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile index 7b4f8ded3..c6bacfde3 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile.develop index 28dd74d09..08b05ada7 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk22/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile index 0c403c72b..829263df7 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:jessie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile.develop index cdca4238e..06661a830 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:jessie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile index 982324840..4484dfd88 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:jessie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile.develop index c8e592e04..ce0ec537e 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:jessie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile index 7f4ea0bdd..7b2e93248 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile.develop index 0d0150b51..64c83278b 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile index 7b8437f3e..b7a7e3d7d 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile @@ -15,14 +15,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -37,7 +79,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -151,17 +193,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile index d12b00e67..ebb6425d0 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile.develop index ad3c61bb6..3d1c79244 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile index 8544ee71c..b1f2073c3 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile.develop index a6ff2f900..a1b9069ad 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile index 7bd1d5c77..212a46f00 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile.develop index ef66d6a46..b7f053db4 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile index afe492f62..f60da3d4f 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile.develop index 7eb42270f..5e0587838 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile index 429791e3b..0547a755d 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile.develop index 5cf421ebf..39962719b 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java16 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile index fba9446be..108ab97a9 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile.develop index 2e988bdf7..6609206ee 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk20/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile index 9a3a70453..759bec500 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile.develop index f72e2c8cb..c5b4b7017 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk21/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile index ad8d82404..204ed91ac 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile.develop index 7f2a53e29..7af823489 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk22/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile index ba80e419f..c2ab7f0c7 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:stretch LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile.develop index 52e78e57e..89129022e 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:stretch-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile index 24adddd84..d974821a1 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:stretch LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile.develop index a3015d244..ed0705286 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:stretch-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile index 8e86c50ab..87cb516d8 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile.develop index 9981bdddb..6b4d1678b 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile index 0b5507fe5..b82e06e5f 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile @@ -15,14 +15,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -37,7 +79,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -58,6 +100,7 @@ RUN apt-get update && \ autoconf-archive \ gnu-standards \ cmake \ + clang \ libunwind-dev \ golang \ at \ @@ -152,17 +195,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile index a2b57a09a..3ae8f3736 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile.develop index 808bef594..46ad2cf61 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile index e1052cf39..d437b62bc 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile.develop index 4dd428b00..bd92c863e 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile index 3818fc362..205fb9f81 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile.develop index 2a3d38894..65158a6ea 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile index eb5d689a8..8cf2f527b 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile.develop index d15750c09..2963160ce 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile index 363648bbe..242732f42 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile.develop index 0f86bf2cf..c53e1f86c 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile index 2271719e3..ac9e0a489 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile.develop index c37f41b04..c40f9fc7d 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk20/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile index 7c1207e39..4c8753fb5 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile.develop index b60069076..a7c7d11b6 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk21/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile index b4287267e..66bb7ef38 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile.develop index 2569e2283..f6d00c935 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk22/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile index af3ca6317..f35d2cb41 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:buster LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile.develop index 42e286088..d4c253fb7 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:buster-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile index 1a847e4d3..7c8c5c46b 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:buster LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile.develop index 65b7fdd53..0bf59cacb 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:buster-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile index 8f6f946ae..055cc59ea 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile.develop index 4a03c54db..f5c2b8068 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/Dockerfile index 4e56d7a49..575d43afb 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/Dockerfile.develop index 9ce8b6801..1a7e148ab 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/lts/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node18/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node18/Dockerfile index a792db222..fd2480903 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node18/Dockerfile.develop index 87806a2e1..e1e01524d 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node18/Dockerfile.develop @@ -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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node20/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node20/Dockerfile index 4e56d7a49..575d43afb 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node20/Dockerfile.develop index 9ce8b6801..1a7e148ab 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/10-buster/nodejs/node20/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile index d9f66e216..4a5dae87d 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile @@ -15,14 +15,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -37,7 +79,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -75,7 +117,7 @@ ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} # zstd source tarball -ENV ZSTD_VERSION=1.5.6 +ENV ZSTD_VERSION=1.5.7 ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin ENV ZSTD_INC_DIR=${ZSTD_DIR}/include @@ -252,6 +294,17 @@ ARG OPENSSL_34_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_34_ ARG OPENSSL_34_TEMP=/tmp/openssl-${OPENSSL_34_VERSION}.tar.gz ARG OPENSSL_34_TEMP_SRC=/tmp/openssl-${OPENSSL_34_VERSION} +# OpenSSL 3.5 +ENV OPENSSL_35_VERSION=3.5.5 +ENV OPENSSL_35_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_35_VERSION} +ENV OPENSSL_35_BIN_DIR=${OPENSSL_35_DIR}/bin +ENV OPENSSL_35_INC_DIR=${OPENSSL_35_DIR}/include +ENV OPENSSL_35_LIB_DIR=${OPENSSL_35_DIR}/lib64 +ENV OPENSSL_35_SRC_DIR=/usr/local/src/openssl/${OPENSSL_35_VERSION} +ARG OPENSSL_35_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP=/tmp/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP_SRC=/tmp/openssl-${OPENSSL_35_VERSION} + # LibreSSL ENV LIBRESSL_VERSION=4.0.0 ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} @@ -286,6 +339,7 @@ RUN apt-get update && \ autoconf-archive \ gnu-standards \ cmake \ + clang \ meson \ libunwind-dev \ at \ @@ -408,17 +462,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ @@ -1082,6 +1179,37 @@ RUN tar -xzf ${OPENSSL_34_TEMP} --directory /tmp && \ --prefix=${OPENSSL_34_DIR} \ && \ make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.5 +################################################################## +RUN mkdir -p ${OPENSSL_35_DIR} ${OPENSSL_35_SRC_DIR} +ADD ${OPENSSL_35_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_35_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_35_TEMP_SRC}/* ${OPENSSL_35_SRC_DIR} && \ + ln -sf ${OPENSSL_35_SRC_DIR} ${OPENSSL_35_DIR}/src && \ + cd ${OPENSSL_35_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_35_DIR} \ + && \ + make -j$(nproc) && \ make -j$(nproc) install && \ echo "# OpenSSL support" >> ${LD_CONF_DIR}/OpenSSL.conf && \ echo ${OPENSSL_34_LIB_DIR} >> ${LD_CONF_DIR}/OpenSSL.conf && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile index 6eb76fe4e..2b4d154a8 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile.develop index dd4ad4554..f3fae29ea 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile index bbe3605f7..f193691e4 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile.develop index 415306df9..e208a6eb6 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile index fe2368bf0..0cf72aed3 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile.develop index 0eacbb9e8..2bc7a98b4 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile index c64d637e1..8104afb71 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile.develop index 325f9cebf..b36dfa020 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile index 7811d36c8..0504859b2 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile.develop index 85fc004c8..ea0d6e91f 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile index 9e13009c2..2ccca94d6 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile.develop index 5e123f818..2336bb65d 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk20/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile index 532c85282..cb9877463 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile.develop index 4049da599..9135ea37b 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile index 178d5444c..7989e4c1d 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile.develop index b95238e54..2cbdf17ca 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile index 7f5feb55c..549f8abb5 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile @@ -3,23 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile.develop index b6b77de7d..64925ac4d 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile index bf3643d8c..4addc227d 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile.develop index 17479ea60..7088ab8c0 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bullseye-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile index f4025c719..135d7cf6b 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile.develop index 899c680e9..46d3d6829 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bullseye-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile index 78e37a4c5..14d0c117d 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile.develop index bc5132833..ea75d4457 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile index 43b054e5d..584f15d76 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile.develop index 22bbaffc2..8d0863b7f 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/current/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/Dockerfile index 74ec87563..ca02bf120 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/Dockerfile.develop index 365d425cf..23b695761 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/lts/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18/Dockerfile index 497cb30c7..456326263 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18/Dockerfile.develop index 5c796e43c..1517d3950 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18/Dockerfile.develop @@ -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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node20/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node20/Dockerfile index 74ec87563..ca02bf120 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node20/Dockerfile.develop index 365d425cf..23b695761 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node20/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile index 43b054e5d..584f15d76 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile.develop index 22bbaffc2..8d0863b7f 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.6/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.6/Dockerfile index 05c325c37..f99d6cdc7 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -70,7 +70,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.7/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.7/Dockerfile index 237b17a3b..46300bf2b 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/2.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -75,7 +75,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.0/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.0/Dockerfile index 7119d9042..91715991d 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.0/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.1/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.1/Dockerfile index e795d3a91..c7b10ab81 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.1/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.10/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.10/Dockerfile index e194911b3..4b04ab8bb 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.10/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.10 ################################################################## ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.11/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.11/Dockerfile index 20a11f64a..bce309731 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.11/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.11 ################################################################## ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile index 23bb7c70a..44332235b 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.12 ################################################################## ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile index d417dd373..46723c82f 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.13 ################################################################## ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.2/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.2/Dockerfile index 4580b28c4..fddbacc2b 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.2/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.2/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.3/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.3/Dockerfile index 6d8ec4f70..be4e45675 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.3/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -92,7 +93,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -102,7 +103,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.3/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.4/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.4/Dockerfile index cd6dba243..1d85f29ae 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.4/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.5/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.5/Dockerfile index 7a529e4fd..8fad0c3cd 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.5/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.5/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -95,7 +96,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -105,7 +106,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.6/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.6/Dockerfile index 552a1fe55..9965daf56 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -96,7 +97,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -106,7 +107,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.7/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.7/Dockerfile index 7c9f5172f..293ee3d73 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.8/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.8/Dockerfile index 581841cd7..55180f4fc 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.8/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.9/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.9/Dockerfile index 5adb7f4cf..1a03753f2 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.9/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} # Python 3.9 ################################################################## ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.10/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.10/Dockerfile index bc425275e..b930acfe7 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.10/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.10/Dockerfile @@ -16,32 +16,32 @@ ARG DEBIAN_FRONTEND=noninteractive # Install packages ENV AMXX_VERSION=1.10 -ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION -ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting -ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include -ENV PATH=$PATH:$AMXX_BIN_PATH -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} COPY inc.tar /tmp RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \ - mkdir -p $AMXX_INSTALL_PATH && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ - mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ - chmod +x $AMXX_BIN_PATH/amxxpc && \ - chmod +x $AMXX_BIN_PATH/compile.sh && \ - tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ - chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \ - chmod -R 700 $AMXX_INC_PATH && \ + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chown -R gitlab-runner:gitlab-runner ${AMXX_INC_PATH} && \ + chmod -R 700 ${AMXX_INC_PATH} && \ amxxpc --help 2>&1 | head -n 1 ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.9/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.9/Dockerfile index d0bc437b3..bd1af29cd 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.9/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/amxx-sdk/1.9/Dockerfile @@ -16,32 +16,32 @@ ARG DEBIAN_FRONTEND=noninteractive # Install packages ENV AMXX_VERSION=1.9 -ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION -ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting -ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include -ENV PATH=$PATH:$AMXX_BIN_PATH -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} COPY inc.tar /tmp RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \ - mkdir -p $AMXX_INSTALL_PATH && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ - mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ - chmod +x $AMXX_BIN_PATH/amxxpc && \ - chmod +x $AMXX_BIN_PATH/compile.sh && \ - tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ - chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \ - chmod -R 700 $AMXX_INC_PATH && \ + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chown -R gitlab-runner:gitlab-runner ${AMXX_INC_PATH} && \ + chmod -R 700 ${AMXX_INC_PATH} && \ amxxpc --help 2>&1 | head -n 1 ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/Dockerfile new file mode 100644 index 000000000..fca16ea6b --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/Dockerfile @@ -0,0 +1,64 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop-jdk17 +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# Android SDK +################################################################## +ENV ANDROID_HOME=${EMG_LOCAL_BASE_DIR}/android/sdk +ENV ANDROID_SDK_ROOT=${ANDROID_HOME} + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + android-sdk \ + sdkmanager \ + android-sdk-build-tools \ + android-sdk-platform-tools-common \ + android-sdk-platform-tools \ + adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ + mkdir -p ${ANDROID_HOME} && \ + sdkmanager --version && \ + gradle -v && \ + mvn -v + +RUN sdkmanager --install --verbose \ + "cmake;3.22.1" \ +# + "cmdline-tools;latest" \ +# + "tools" \ +# + "platform-tools" \ +# + "platforms;android-21" \ + "platforms;android-34" \ + "platforms;android-35" \ +# + "build-tools;21.1.2" \ + "build-tools;34.0.0" \ + "build-tools;35.0.0" \ +# + "extras;android;m2repository" \ +# + "ndk;25.1.8937393" \ + "ndk;25.2.9519653" + +ENV PATH="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/tools/proguard/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH}" + +# Activate android sdk +RUN yes | sdkmanager --licenses && \ + flutter doctor && \ + yes | sdkmanager --licenses && \ + flutter doctor -v + +################################################################## +# Cleanup +################################################################## +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/* + +RUN updatedb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/README.md b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/README.md similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/README.md rename to linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/README.md diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/Dockerfile deleted file mode 100644 index 5fe62b675..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/Dockerfile +++ /dev/null @@ -1,553 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-develop-jdk11 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# Android SDK -################################################################## -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - maven \ - android-sdk \ - sdkmanager \ - android-sdk-build-tools \ - android-sdk-platform-tools-common \ - android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ - apt remove -y gradle && \ - sdkmanager --version && \ - mvn -v - -# Install ALL ANDROID SDK -RUN sdkmanager --install \ - "build-tools;17.0.0" \ - "build-tools;18.0.0" \ - "build-tools;18.0.1" \ - "build-tools;18.1.0" \ - "build-tools;18.1.1" \ - "build-tools;19.0.0" \ - "build-tools;19.0.1" \ - "build-tools;19.0.2" \ - "build-tools;19.0.3" \ - "build-tools;19.1.0" \ - "build-tools;20.0.0" \ - "build-tools;21.0.0" \ - "build-tools;21.0.1" \ - "build-tools;21.0.2" \ - "build-tools;21.1.0" \ - "build-tools;21.1.1" \ - "build-tools;21.1.2" \ - "build-tools;22.0.0" \ - "build-tools;22.0.1" \ - "build-tools;23.0.0" \ - "build-tools;23.0.1" \ - "build-tools;23.0.2" \ - "build-tools;23.0.3" \ - "build-tools;24.0.0" \ - "build-tools;24.0.1" \ - "build-tools;24.0.2" \ - "build-tools;24.0.3" \ - "build-tools;25.0.0" \ - "build-tools;25.0.1" \ - "build-tools;25.0.2" \ - "build-tools;25.0.3" \ - "build-tools;26.0.0" \ - "build-tools;26.0.0-rc1" \ - "build-tools;26.0.0-rc2" \ - "build-tools;26.0.1" \ - "build-tools;26.0.2" \ - "build-tools;26.0.3" \ - "build-tools;27.0.0" \ - "build-tools;27.0.1" \ - "build-tools;27.0.2" \ - "build-tools;27.0.3" \ - "build-tools;28.0.0" \ - "build-tools;28.0.0-rc1" \ - "build-tools;28.0.0-rc2" \ - "build-tools;28.0.1" \ - "build-tools;28.0.2" \ - "build-tools;28.0.3" \ - "build-tools;29.0.0" \ - "build-tools;29.0.0-rc1" \ - "build-tools;29.0.0-rc2" \ - "build-tools;29.0.0-rc3" \ - "build-tools;29.0.1" \ - "build-tools;29.0.2" \ - "build-tools;29.0.3" \ - "build-tools;30.0.0" \ - "build-tools;30.0.0-rc1" \ - "build-tools;30.0.0-rc2" \ - "build-tools;30.0.0-rc3" \ - "build-tools;30.0.0-rc4" \ - "build-tools;30.0.1" \ - "build-tools;30.0.2" \ - "build-tools;30.0.3" \ - "build-tools;31.0.0" \ - "build-tools;31.0.0-rc1" \ - "build-tools;31.0.0-rc2" \ - "build-tools;31.0.0-rc3" \ - "build-tools;31.0.0-rc4" \ - "build-tools;31.0.0-rc5" \ - "build-tools;32.0.0" \ - "build-tools;32.1.0-rc1" \ - "build-tools;33.0.0" \ - "build-tools;33.0.0-rc1" \ - "build-tools;33.0.0-rc2" \ - "build-tools;33.0.0-rc3" \ - "build-tools;33.0.0-rc4" \ - "build-tools;33.0.1" \ - "build-tools;33.0.2" \ - "build-tools;34.0.0" \ - "build-tools;34.0.0-rc1" \ - "build-tools;34.0.0-rc2" \ - "build-tools;34.0.0-rc3" \ - "build-tools;34.0.0-rc4" - - -RUN sdkmanager --install \ - "cmake;3.10.2.4988404" \ - "cmake;3.18.1" \ - "cmake;3.22.1" \ - "cmake;3.6.4111459" - -RUN sdkmanager --install \ - "cmdline-tools;1.0" \ - "cmdline-tools;1.0-alpha01" \ - "cmdline-tools;10.0-beta04" \ - "cmdline-tools;11.0-alpha07" \ - "cmdline-tools;2.0" \ - "cmdline-tools;2.0-rc01" \ - "cmdline-tools;2.1" \ - "cmdline-tools;3.0" \ - "cmdline-tools;3.0-beta01" \ - "cmdline-tools;4.0" \ - "cmdline-tools;4.0-alpha02" \ - "cmdline-tools;4.0-beta01" \ - "cmdline-tools;5.0" \ - "cmdline-tools;5.0-alpha01" \ - "cmdline-tools;6.0" \ - "cmdline-tools;7.0" \ - "cmdline-tools;8.0" \ - "cmdline-tools;9.0" \ - "cmdline-tools;latest" - -RUN sdkmanager --install \ - "extras;android;m2repository" \ - "extras;android;m2repository;01" \ - "extras;android;m2repository;02" \ - "extras;android;m2repository;03" \ - "extras;android;m2repository;04" \ - "extras;android;m2repository;06" \ - "extras;android;m2repository;07" \ - "extras;android;m2repository;08" \ - "extras;android;m2repository;09" \ - "extras;android;m2repository;1" \ - "extras;android;m2repository;10" \ - "extras;android;m2repository;11" \ - "extras;android;m2repository;12" \ - "extras;android;m2repository;13" \ - "extras;android;m2repository;14" \ - "extras;android;m2repository;15" \ - "extras;android;m2repository;16" \ - "extras;android;m2repository;17" \ - "extras;android;m2repository;18" \ - "extras;android;m2repository;19" \ - "extras;android;m2repository;2" \ - "extras;android;m2repository;20" \ - "extras;android;m2repository;21" \ - "extras;android;m2repository;22" \ - "extras;android;m2repository;23" \ - "extras;android;m2repository;24" \ - "extras;android;m2repository;25" \ - "extras;android;m2repository;26" \ - "extras;android;m2repository;27" \ - "extras;android;m2repository;28" \ - "extras;android;m2repository;29" \ - "extras;android;m2repository;3" \ - "extras;android;m2repository;30" \ - "extras;android;m2repository;31" \ - "extras;android;m2repository;32" \ - "extras;android;m2repository;33" \ - "extras;android;m2repository;34" \ - "extras;android;m2repository;35" \ - "extras;android;m2repository;36" \ - "extras;android;m2repository;37" \ - "extras;android;m2repository;38" \ - "extras;android;m2repository;39" \ - "extras;android;m2repository;4" \ - "extras;android;m2repository;40" \ - "extras;android;m2repository;41" \ - "extras;android;m2repository;42" \ - "extras;android;m2repository;43" \ - "extras;android;m2repository;44" \ - "extras;android;m2repository;45" \ - "extras;android;m2repository;46" \ - "extras;android;m2repository;47" \ - "extras;android;m2repository;6" \ - "extras;android;m2repository;7" \ - "extras;android;m2repository;8" \ - "extras;android;m2repository;9" - -RUN sdkmanager --install \ - "platform-tools" \ - "platform-tools;24.0.0" \ - "platform-tools;29.0.5" \ - "platform-tools;29.0.6" \ - "platform-tools;30.0.0" \ - "platform-tools;30.0.1" \ - "platform-tools;30.0.2" \ - "platform-tools;30.0.3" \ - "platform-tools;30.0.4" \ - "platform-tools;30.0.5" \ - "platform-tools;31.0.0" \ - "platform-tools;31.0.1" \ - "platform-tools;31.0.2" \ - "platform-tools;31.0.3" \ - "platform-tools;32.0.0" \ - "platform-tools;33.0.0" \ - "platform-tools;33.0.1" \ - "platform-tools;33.0.2" \ - "platform-tools;33.0.3" \ - "platform-tools;34.0.0" \ - "platform-tools;34.0.1" \ - "platform-tools;34.0.3" - -RUN sdkmanager --install \ - "platforms;android-10" \ - "platforms;android-11" \ - "platforms;android-12" \ - "platforms;android-13" \ - "platforms;android-14" \ - "platforms;android-15" \ - "platforms;android-16" \ - "platforms;android-17" \ - "platforms;android-18" \ - "platforms;android-19" \ - "platforms;android-20" \ - "platforms;android-21" \ - "platforms;android-22" \ - "platforms;android-23" \ - "platforms;android-24" \ - "platforms;android-25" \ - "platforms;android-26" \ - "platforms;android-27" \ - "platforms;android-28" \ - "platforms;android-29" \ - "platforms;android-3" \ - "platforms;android-30" \ - "platforms;android-31" \ - "platforms;android-32" \ - "platforms;android-33" \ - "platforms;android-34" \ - "platforms;android-4" \ - "platforms;android-5" \ - "platforms;android-6" \ - "platforms;android-7" \ - "platforms;android-8" \ - "platforms;android-9" - -RUN sdkmanager --install \ -# "ndk-bundle;11.0.2655954" \ -# "ndk-bundle;11.1.2683735" \ -# "ndk-bundle;11.2.2725575" \ -# "ndk-bundle;12.0.2931149" \ -# "ndk-bundle;12.1.2977051" \ -# "ndk-bundle;13.0.3315539" \ -# "ndk-bundle;13.1.3345770" \ -# "ndk-bundle;14.0.3770861" \ -# "ndk-bundle;14.1.3816874" \ -# "ndk-bundle;15.0.4075724" \ -# "ndk-bundle;15.1.4119039" \ -# "ndk-bundle;15.2.4203891" \ -# "ndk-bundle;16.0.4442984" \ -# "ndk-bundle;16.1.4479499" \ -# "ndk-bundle;17.0.4754217" \ -# "ndk-bundle;17.1.4828580" \ -# "ndk-bundle;17.2.4988734" \ -# "ndk-bundle;18.1.5063045" \ -# "ndk-bundle;19.0.5232133" \ -# "ndk-bundle;19.1.5304403" \ -# "ndk-bundle;19.2.5345600" \ -# "ndk-bundle;20.0.5392854-beta2" \ -# "ndk-bundle;20.0.5471264-beta3" \ -# "ndk-bundle;20.0.5594570" \ -# "ndk-bundle;20.1.5948944" \ -# "ndk-bundle;21.0.6011959-beta2" \ -# "ndk-bundle;21.0.6113669" \ -# "ndk-bundle;21.1.6210238-beta1" \ -# "ndk-bundle;21.1.6273396-beta2" \ -# "ndk-bundle;21.1.6352462" \ -# "ndk-bundle;21.1.6363665-beta3" \ -# "ndk-bundle;21.2.6472646" \ -# "ndk-bundle;21.3.6528147" \ -# "ndk-bundle;21.4.7075529" \ -# "ndk-bundle;22.0.6917172-beta1" \ -# "ndk-bundle;22.0.7026061" \ -# "ndk-bundle;22.1.7171670" \ -# "ndk-bundle;23.0.7123448-beta1" \ -# "ndk-bundle;23.0.7196353-beta2" \ -# "ndk-bundle;23.0.7272597-beta3" \ -# "ndk-bundle;23.0.7344513-beta4" \ -# "ndk-bundle;23.0.7421159-beta5" \ -# "ndk-bundle;23.0.7530507-beta6" \ -# "ndk-bundle;23.0.7599858" \ -# "ndk-bundle;23.1.7779620" \ -# "ndk-bundle;23.2.8568313" \ -# "ndk-bundle;24.0.7856742-beta1" \ -# "ndk-bundle;24.0.7956693-beta2" \ -# "ndk-bundle;24.0.8079956-beta3" \ -# "ndk-bundle;24.0.8215888" \ -# "ndk-bundle;25.0.8141415-beta1" \ -# "ndk-bundle;25.0.8221429-beta2" \ -# "ndk-bundle;25.0.8355429-beta3" \ -# "ndk-bundle;25.0.8528842-beta4" \ - "ndk-bundle;25.0.8775105" \ - "ndk-bundle;25.1.8937393" \ - "ndk-bundle;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk-bundle;r10e" \ -# "ndk-bundle;r11" \ -# "ndk-bundle;r11b" \ -# "ndk-bundle;r11c" \ -# "ndk-bundle;r12" \ -# "ndk-bundle;r12b" \ -# "ndk-bundle;r13" \ -# "ndk-bundle;r13b" \ -# "ndk-bundle;r14" \ -# "ndk-bundle;r14b" \ -# "ndk-bundle;r15" \ -# "ndk-bundle;r15b" \ -# "ndk-bundle;r15c" \ -# "ndk-bundle;r16" \ -# "ndk-bundle;r16b" \ -# "ndk-bundle;r17" \ -# "ndk-bundle;r17b" \ -# "ndk-bundle;r17c" \ -# "ndk-bundle;r18b" \ -# "ndk-bundle;r19" \ -# "ndk-bundle;r19b" \ -# "ndk-bundle;r19c" \ -# "ndk-bundle;r20" \ -# "ndk-bundle;r20-beta2" \ -# "ndk-bundle;r20-beta3" \ -# "ndk-bundle;r20b" \ -# "ndk-bundle;r21" \ -# "ndk-bundle;r21-beta2" \ -# "ndk-bundle;r21b" \ -# "ndk-bundle;r21b-beta1" \ -# "ndk-bundle;r21b-beta2" \ -# "ndk-bundle;r21b-beta3" \ -# "ndk-bundle;r21c" \ -# "ndk-bundle;r21d" \ -# "ndk-bundle;r21e" \ -# "ndk-bundle;r22" \ -# "ndk-bundle;r22-beta1" \ -# "ndk-bundle;r22b" \ -# "ndk-bundle;r23" \ -# "ndk-bundle;r23-beta1" \ -# "ndk-bundle;r23-beta2" \ -# "ndk-bundle;r23-beta3" \ -# "ndk-bundle;r23-beta4" \ -# "ndk-bundle;r23-beta5" \ -# "ndk-bundle;r23-beta6" \ -# "ndk-bundle;r23b" \ -# "ndk-bundle;r23c" \ -# "ndk-bundle;r24" \ -# "ndk-bundle;r24-beta1" \ -# "ndk-bundle;r24-beta2" \ -# "ndk-bundle;r24-rc1" \ - "ndk-bundle;r25" \ -# "ndk-bundle;r25-beta1" \ -# "ndk-bundle;r25-beta2" \ -# "ndk-bundle;r25-beta3" \ -# "ndk-bundle;r25-beta4" \ -# "ndk-bundle;r25b" \ - "ndk-bundle;r25c" - -RUN sdkmanager --install \ -# "ndk;11.0.2655954" \ -# "ndk;11.1.2683735" \ -# "ndk;11.2.2725575" \ -# "ndk;12.0.2931149" \ -# "ndk;12.1.2977051" \ -# "ndk;13.0.3315539" \ -# "ndk;13.1.3345770" \ -# "ndk;14.0.3770861" \ -# "ndk;14.1.3816874" \ -# "ndk;15.0.4075724" \ -# "ndk;15.1.4119039" \ -# "ndk;15.2.4203891" \ -# "ndk;16.0.4442984" \ -# "ndk;16.1.4479499" \ -# "ndk;17.0.4754217" \ -# "ndk;17.1.4828580" \ -# "ndk;17.2.4988734" \ -# "ndk;18.1.5063045" \ -# "ndk;19.0.5232133" \ -# "ndk;19.1.5304403" \ -# "ndk;19.2.5345600" \ -# "ndk;20.0.5392854-beta2" \ -# "ndk;20.0.5471264-beta3" \ -# "ndk;20.0.5594570" \ -# "ndk;20.1.5948944" \ -# "ndk;21.0.6011959-beta2" \ -# "ndk;21.0.6113669" \ -# "ndk;21.1.6210238-beta1" \ -# "ndk;21.1.6273396-beta2" \ -# "ndk;21.1.6352462" \ -# "ndk;21.1.6363665-beta3" \ -# "ndk;21.2.6472646" \ -# "ndk;21.3.6528147" \ -# "ndk;21.4.7075529" \ -# "ndk;22.0.6917172-beta1" \ -# "ndk;22.0.7026061" \ -# "ndk;22.1.7171670" \ -# "ndk;23.0.7123448-beta1" \ -# "ndk;23.0.7196353-beta2" \ -# "ndk;23.0.7272597-beta3" \ -# "ndk;23.0.7344513-beta4" \ -# "ndk;23.0.7421159-beta5" \ -# "ndk;23.0.7530507-beta6" \ -# "ndk;23.0.7599858" \ -# "ndk;23.1.7779620" \ -# "ndk;23.2.8568313" \ -# "ndk;24.0.7856742-beta1" \ -# "ndk;24.0.7956693-beta2" \ -# "ndk;24.0.8079956-beta3" \ -# "ndk;24.0.8215888" \ -# "ndk;25.0.8141415-beta1" \ -# "ndk;25.0.8221429-beta2" \ -# "ndk;25.0.8355429-beta3" \ -# "ndk;25.0.8528842-beta4" \ - "ndk;25.0.8775105" \ - "ndk;25.1.8937393" \ - "ndk;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk;r10e" \ -# "ndk;r11" \ -# "ndk;r11b" \ -# "ndk;r11c" \ -# "ndk;r12" \ -# "ndk;r12b" \ -# "ndk;r13" \ -# "ndk;r13b" \ -# "ndk;r14" \ -# "ndk;r14b" \ -# "ndk;r15" \ -# "ndk;r15b" \ -# "ndk;r15c" \ -# "ndk;r16" \ -# "ndk;r16b" \ -# "ndk;r17" \ -# "ndk;r17b" \ -# "ndk;r17c" \ -# "ndk;r18b" \ -# "ndk;r19" \ -# "ndk;r19b" \ -# "ndk;r19c" \ -# "ndk;r20" \ -# "ndk;r20-beta2" \ -# "ndk;r20-beta3" \ -# "ndk;r20b" \ -# "ndk;r21" \ -# "ndk;r21-beta2" \ -# "ndk;r21b" \ -# "ndk;r21b-beta1" \ -# "ndk;r21b-beta2" \ -# "ndk;r21b-beta3" \ -# "ndk;r21c" \ -# "ndk;r21d" \ -# "ndk;r21e" \ -# "ndk;r22" \ -# "ndk;r22-beta1" \ -# "ndk;r22b" \ -# "ndk;r23" \ -# "ndk;r23-beta1" \ -# "ndk;r23-beta2" \ -# "ndk;r23-beta3" \ -# "ndk;r23-beta4" \ -# "ndk;r23-beta5" \ -# "ndk;r23-beta6" \ -# "ndk;r23b" \ -# "ndk;r23c" \ -# "ndk;r24" \ -# "ndk;r24-beta1" \ -# "ndk;r24-beta2" \ -# "ndk;r24-rc1" \ - "ndk;r25" \ -# "ndk;r25-beta1" \ -# "ndk;r25-beta2" \ -# "ndk;r25-beta3" \ -# "ndk;r25-beta4" \ -# "ndk;r25b" \ - "ndk;r25c" - -RUN sdkmanager --install \ - "tools" \ - "tools;20.0.1" \ - "tools;20.0.3" \ - "tools;21.0.1" \ - "tools;22.0.1" \ - "tools;22.0.4" \ - "tools;22.0.5" \ - "tools;22.2.1" \ - "tools;22.6.1" \ - "tools;22.6.2" \ - "tools;22.6.3" \ - "tools;22.6.4" \ - "tools;23.0.1" \ - "tools;23.0.2" \ - "tools;23.0.4" \ - "tools;23.0.5" \ - "tools;24.0.1" \ - "tools;24.0.2" \ - "tools;24.1.2" \ - "tools;24.3.1" \ - "tools;24.3.2" \ - "tools;24.3.3" \ - "tools;24.3.4" \ - "tools;24.4.1" \ - "tools;25.0.1" \ - "tools;25.0.2" \ - "tools;25.0.3" \ - "tools;25.0.4" \ - "tools;25.0.5" \ - "tools;25.0.6" \ - "tools;25.0.7" \ - "tools;25.0.8" \ - "tools;25.0.9" \ - "tools;25.1.0" \ - "tools;25.1.1" \ - "tools;25.1.2" \ - "tools;25.1.3" \ - "tools;25.1.4" \ - "tools;25.1.5" \ - "tools;25.1.6" \ - "tools;25.1.7" \ - "tools;25.2.1" \ - "tools;25.2.2" \ - "tools;25.2.3" \ - "tools;25.2.4" \ - "tools;25.2.5" \ - "tools;26.1.1" - -# Activate android sdk -#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license -#RUN rm -rfv /usr/lib/android-sdk/licenses/* -RUN yes | sdkmanager --licenses -RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/docker-compose.yml deleted file mode 100644 index 774836c9c..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - app: - image: "hub.epicm.org/epicmorg/debian:bookworm-android-sdk-jdk8" - build: - context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/sdkman.sh b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/sdkman.sh deleted file mode 100755 index 59b74df1e..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk11/sdkman.sh +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Marco Vermeulen -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# install:- channel: stable; cliVersion: 5.15.0; cliNativeVersion: NA; api: https://api.sdkman.io/2 - -# Global variables -SDKMAN_SERVICE="https://api.sdkman.io/2" -SDKMAN_VERSION="5.15.0" -SDKMAN_PLATFORM=$(uname) - -if [ -z "$SDKMAN_DIR" ]; then - SDKMAN_DIR="$HOME/.sdkman" - SDKMAN_DIR_RAW='$HOME/.sdkman' -else - SDKMAN_DIR_RAW="$SDKMAN_DIR" -fi - -# Local variables -sdkman_tmp_folder="${SDKMAN_DIR}/tmp" -sdkman_zip_file="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}.zip" -sdkman_zip_base_folder="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}" -sdkman_ext_folder="${SDKMAN_DIR}/ext" -sdkman_etc_folder="${SDKMAN_DIR}/etc" -sdkman_var_folder="${SDKMAN_DIR}/var" -sdkman_archives_folder="${SDKMAN_DIR}/archives" -sdkman_candidates_folder="${SDKMAN_DIR}/candidates" -sdkman_config_file="${sdkman_etc_folder}/config" -sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" -sdkman_bashrc="${HOME}/.bashrc" -sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc" - -sdkman_init_snippet=$( cat << EOF -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$SDKMAN_DIR_RAW" -[[ -s "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" -EOF -) - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -solaris=false; -freebsd=false; -case "$(uname)" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - SunOS*) - solaris=true - ;; - FreeBSD*) - freebsd=true -esac - -echo '' -echo ' -+syyyyyyys:' -echo ' `/yho:` -yd.' -echo ' `/yh/` +m.' -echo ' .oho. hy .`' -echo ' .sh/` :N` `-/o` `+dyyo:.' -echo ' .yh:` `M- `-/osysoym :hs` `-+sys: hhyssssssssy+' -echo ' .sh:` `N: ms/-`` yy.yh- -hy. `.N-````````+N.' -echo ' `od/` `N- -/oM- ddd+` `sd: hNNm -N:' -echo ' :do` .M. dMMM- `ms. /d+` `NMMs `do' -echo ' .yy- :N` ```mMMM. - -hy. /MMM: yh' -echo ' `+d+` `:/oo/` `-/osyh/ossssssdNMM` .sh: yMMN` /m.' -echo ' -dh- :ymNMMMMy `-/shmNm-`:N/-.`` `.sN /N- `NMMy .m/' -echo ' `oNs` -hysosmMMMMydmNmds+-.:ohm : sd` :MMM/ yy' -echo ' .hN+ /d: -MMMmhs/-.` .MMMh .ss+- `yy` sMMN` :N.' -echo ' :mN/ `N/ `o/-` :MMMo +MMMN- .` `ds mMMh do' -echo ' /NN/ `N+....--:/+oooosooo+:sMMM: hMMMM: `my .m+ -MMM+ :N.' -echo ' /NMo -+ooooo+/:-....`...:+hNMN. `NMMMd` .MM/ -m: oMMN. hs' -echo ' -NMd` :mm -MMMm- .s/ -MMm. /m- mMMd -N.' -echo ' `mMM/ .- /MMh. -dMo -MMMy od. .MMMs..---yh' -echo ' +MMM. sNo`.sNMM+ :MMMM/ sh`+MMMNmNm+++-' -echo ' mMMM- /--ohmMMM+ :MMMMm. `hyymmmdddo' -echo ' MMMMh. ```` `-+yy/`yMMM/ :MMMMMy -sm:.``..-:-.`' -echo ' dMMMMmo-.``````..-:/osyhddddho. `+shdh+. hMMM: :MmMMMM/ ./yy/` `:sys+/+sh/' -echo ' .dMMMMMMmdddddmmNMMMNNNNNMMMMMs sNdo- dMMM- `-/yd/MMMMm-:sy+. :hs- /N`' -echo ' `/ymNNNNNNNmmdys+/::----/dMMm: +m- mMMM+ohmo/.` sMMMMdo- .om: `sh' -echo ' `.-----+/.` `.-+hh/` `od. NMMNmds/ `mmy:` +mMy `:yy.' -echo ' /moyso+//+ossso:. .yy` `dy+:` .. :MMMN+---/oys:' -echo ' /+m: `.-:::-` /d+ +MMMMMMMNh:`' -echo ' +MN/ -yh. `+hddhy+.' -echo ' /MM+ .sh:' -echo ' :NMo -sh/' -echo ' -NMs `/yy:' -echo ' .NMy `:sh+.' -echo ' `mMm` ./yds-' -echo ' `dMMMmyo:-.````.-:oymNy:`' -echo ' +NMMMMMMMMMMMMMMMMms:`' -echo ' -+shmNMMMNmdy+:`' -echo '' -echo '' -echo ' Now attempting installation...' -echo '' -echo '' - -# Sanity checks - -echo "Looking for a previous installation of SDKMAN..." -if [ -d "$SDKMAN_DIR" ]; then - echo "SDKMAN found." - echo "" - echo "======================================================================================================" - echo " You already have SDKMAN installed." - echo " SDKMAN was found at:" - echo "" - echo " ${SDKMAN_DIR}" - echo "" - echo " Please consider running the following if you need to upgrade." - echo "" - echo " $ sdk selfupdate force" - echo "" - echo "======================================================================================================" - echo "" - exit 0 -fi - -echo "Looking for unzip..." -if ! command -v unzip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install unzip on your system using your favourite package manager." - echo "" - echo " Restart after installing unzip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for zip..." -if ! command -v zip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install zip on your system using your favourite package manager." - echo "" - echo " Restart after installing zip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for curl..." -if ! command -v curl > /dev/null; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install curl on your system using your favourite package manager." - echo "" - echo " Restart after installing curl." - echo "======================================================================================================" - echo "" - exit 1 -fi - -if [[ "$solaris" == true ]]; then - echo "Looking for gsed..." - if [ -z $(which gsed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install gsed on your solaris system." - echo "" - echo " SDKMAN uses gsed extensively." - echo "" - echo " Restart after installing gsed." - echo "======================================================================================================" - echo "" - exit 1 - fi -else - echo "Looking for sed..." - if [ -z $(command -v sed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install sed on your system using your favourite package manager." - echo "" - echo " Restart after installing sed." - echo "======================================================================================================" - echo "" - exit 1 - fi -fi - -echo "Installing SDKMAN scripts..." - - -# Create directory structure - -echo "Create distribution directories..." -mkdir -p "$sdkman_tmp_folder" -mkdir -p "$sdkman_ext_folder" -mkdir -p "$sdkman_etc_folder" -mkdir -p "$sdkman_var_folder" -mkdir -p "$sdkman_archives_folder" -mkdir -p "$sdkman_candidates_folder" - -echo "Getting available candidates..." -SDKMAN_CANDIDATES_CSV=$(curl -s "${SDKMAN_SERVICE}/candidates/all") -echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" - -echo "Prime the config file..." -touch "$sdkman_config_file" -echo "sdkman_auto_answer=false" >> "$sdkman_config_file" -if [ -z "$ZSH_VERSION" -a -z "$BASH_VERSION" ]; then - echo "sdkman_auto_complete=false" >> "$sdkman_config_file" -else - echo "sdkman_auto_complete=true" >> "$sdkman_config_file" -fi -echo "sdkman_auto_env=false" >> "$sdkman_config_file" -echo "sdkman_auto_update=true" >> "$sdkman_config_file" -echo "sdkman_beta_channel=false" >> "$sdkman_config_file" -echo "sdkman_checksum_enable=true" >> "$sdkman_config_file" -echo "sdkman_colour_enable=true" >> "$sdkman_config_file" -echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file" -echo "sdkman_curl_max_time=10" >> "$sdkman_config_file" -echo "sdkman_debug_mode=false" >> "$sdkman_config_file" -echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file" -echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file" -echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file" - -echo "Download script archive..." -curl --location --progress-bar "${SDKMAN_SERVICE}/broker/download/sdkman/install/${SDKMAN_VERSION}/${SDKMAN_PLATFORM}" > "$sdkman_zip_file" - -ARCHIVE_OK=$(unzip -qt "$sdkman_zip_file" | grep 'No errors detected in compressed data') -if [[ -z "$ARCHIVE_OK" ]]; then - echo "Downloaded zip archive corrupt. Are you connected to the internet?" - echo "" - echo "If problems persist, please ask for help on our Slack:" - echo "* easy sign up: https://slack.sdkman.io/" - echo "* report on channel: https://sdkman.slack.com/app_redirect?channel=user-issues" - rm -rf "$SDKMAN_DIR" - exit 1 -fi - -echo "Extract script archive..." -if [[ "$cygwin" == 'true' ]]; then - echo "Cygwin detected - normalizing paths for unzip..." - sdkman_tmp_folder=$(cygpath -w "$sdkman_tmp_folder") - sdkman_zip_file=$(cygpath -w "$sdkman_zip_file") - sdkman_zip_base_folder=$(cygpath -w "$sdkman_zip_base_folder") -fi -unzip -qo "$sdkman_zip_file" -d "$sdkman_tmp_folder" - -echo "Install scripts..." -mv "${sdkman_zip_base_folder}/"* "$SDKMAN_DIR" -rm -rf "$sdkman_zip_base_folder" - -echo "Set version to $SDKMAN_VERSION ..." -echo "$SDKMAN_VERSION" > "${SDKMAN_DIR}/var/version" - - -if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" - echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" - echo "Added sdkman init snippet to $sdkman_bash_profile" - fi -else - echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" - echo "Added sdkman init snippet to $sdkman_bashrc" - fi -fi - -echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" - echo "Updated existing ${sdkman_zshrc}" -fi - - - -echo -e "\n\n\nAll done!\n\n" - -echo "You are subscribed to the STABLE channel." - -echo "" -echo "Please open a new terminal, or run the following in the existing one:" -echo "" -echo " source \"${SDKMAN_DIR}/bin/sdkman-init.sh\"" -echo "" -echo "Then issue the following command:" -echo "" -echo " sdk help" -echo "" -echo "Enjoy!!!" diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/Dockerfile deleted file mode 100644 index 6e452d838..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/Dockerfile +++ /dev/null @@ -1,553 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-develop-jdk17 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# Android SDK -################################################################## -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - maven \ - android-sdk \ - sdkmanager \ - android-sdk-build-tools \ - android-sdk-platform-tools-common \ - android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ - apt remove -y gradle && \ - sdkmanager --version && \ - mvn -v - -# Install ALL ANDROID SDK -RUN sdkmanager --install \ - "build-tools;17.0.0" \ - "build-tools;18.0.0" \ - "build-tools;18.0.1" \ - "build-tools;18.1.0" \ - "build-tools;18.1.1" \ - "build-tools;19.0.0" \ - "build-tools;19.0.1" \ - "build-tools;19.0.2" \ - "build-tools;19.0.3" \ - "build-tools;19.1.0" \ - "build-tools;20.0.0" \ - "build-tools;21.0.0" \ - "build-tools;21.0.1" \ - "build-tools;21.0.2" \ - "build-tools;21.1.0" \ - "build-tools;21.1.1" \ - "build-tools;21.1.2" \ - "build-tools;22.0.0" \ - "build-tools;22.0.1" \ - "build-tools;23.0.0" \ - "build-tools;23.0.1" \ - "build-tools;23.0.2" \ - "build-tools;23.0.3" \ - "build-tools;24.0.0" \ - "build-tools;24.0.1" \ - "build-tools;24.0.2" \ - "build-tools;24.0.3" \ - "build-tools;25.0.0" \ - "build-tools;25.0.1" \ - "build-tools;25.0.2" \ - "build-tools;25.0.3" \ - "build-tools;26.0.0" \ - "build-tools;26.0.0-rc1" \ - "build-tools;26.0.0-rc2" \ - "build-tools;26.0.1" \ - "build-tools;26.0.2" \ - "build-tools;26.0.3" \ - "build-tools;27.0.0" \ - "build-tools;27.0.1" \ - "build-tools;27.0.2" \ - "build-tools;27.0.3" \ - "build-tools;28.0.0" \ - "build-tools;28.0.0-rc1" \ - "build-tools;28.0.0-rc2" \ - "build-tools;28.0.1" \ - "build-tools;28.0.2" \ - "build-tools;28.0.3" \ - "build-tools;29.0.0" \ - "build-tools;29.0.0-rc1" \ - "build-tools;29.0.0-rc2" \ - "build-tools;29.0.0-rc3" \ - "build-tools;29.0.1" \ - "build-tools;29.0.2" \ - "build-tools;29.0.3" \ - "build-tools;30.0.0" \ - "build-tools;30.0.0-rc1" \ - "build-tools;30.0.0-rc2" \ - "build-tools;30.0.0-rc3" \ - "build-tools;30.0.0-rc4" \ - "build-tools;30.0.1" \ - "build-tools;30.0.2" \ - "build-tools;30.0.3" \ - "build-tools;31.0.0" \ - "build-tools;31.0.0-rc1" \ - "build-tools;31.0.0-rc2" \ - "build-tools;31.0.0-rc3" \ - "build-tools;31.0.0-rc4" \ - "build-tools;31.0.0-rc5" \ - "build-tools;32.0.0" \ - "build-tools;32.1.0-rc1" \ - "build-tools;33.0.0" \ - "build-tools;33.0.0-rc1" \ - "build-tools;33.0.0-rc2" \ - "build-tools;33.0.0-rc3" \ - "build-tools;33.0.0-rc4" \ - "build-tools;33.0.1" \ - "build-tools;33.0.2" \ - "build-tools;34.0.0" \ - "build-tools;34.0.0-rc1" \ - "build-tools;34.0.0-rc2" \ - "build-tools;34.0.0-rc3" \ - "build-tools;34.0.0-rc4" - - -RUN sdkmanager --install \ - "cmake;3.10.2.4988404" \ - "cmake;3.18.1" \ - "cmake;3.22.1" \ - "cmake;3.6.4111459" - -RUN sdkmanager --install \ - "cmdline-tools;1.0" \ - "cmdline-tools;1.0-alpha01" \ - "cmdline-tools;10.0-beta04" \ - "cmdline-tools;11.0-alpha07" \ - "cmdline-tools;2.0" \ - "cmdline-tools;2.0-rc01" \ - "cmdline-tools;2.1" \ - "cmdline-tools;3.0" \ - "cmdline-tools;3.0-beta01" \ - "cmdline-tools;4.0" \ - "cmdline-tools;4.0-alpha02" \ - "cmdline-tools;4.0-beta01" \ - "cmdline-tools;5.0" \ - "cmdline-tools;5.0-alpha01" \ - "cmdline-tools;6.0" \ - "cmdline-tools;7.0" \ - "cmdline-tools;8.0" \ - "cmdline-tools;9.0" \ - "cmdline-tools;latest" - -RUN sdkmanager --install \ - "extras;android;m2repository" \ - "extras;android;m2repository;01" \ - "extras;android;m2repository;02" \ - "extras;android;m2repository;03" \ - "extras;android;m2repository;04" \ - "extras;android;m2repository;06" \ - "extras;android;m2repository;07" \ - "extras;android;m2repository;08" \ - "extras;android;m2repository;09" \ - "extras;android;m2repository;1" \ - "extras;android;m2repository;10" \ - "extras;android;m2repository;11" \ - "extras;android;m2repository;12" \ - "extras;android;m2repository;13" \ - "extras;android;m2repository;14" \ - "extras;android;m2repository;15" \ - "extras;android;m2repository;16" \ - "extras;android;m2repository;17" \ - "extras;android;m2repository;18" \ - "extras;android;m2repository;19" \ - "extras;android;m2repository;2" \ - "extras;android;m2repository;20" \ - "extras;android;m2repository;21" \ - "extras;android;m2repository;22" \ - "extras;android;m2repository;23" \ - "extras;android;m2repository;24" \ - "extras;android;m2repository;25" \ - "extras;android;m2repository;26" \ - "extras;android;m2repository;27" \ - "extras;android;m2repository;28" \ - "extras;android;m2repository;29" \ - "extras;android;m2repository;3" \ - "extras;android;m2repository;30" \ - "extras;android;m2repository;31" \ - "extras;android;m2repository;32" \ - "extras;android;m2repository;33" \ - "extras;android;m2repository;34" \ - "extras;android;m2repository;35" \ - "extras;android;m2repository;36" \ - "extras;android;m2repository;37" \ - "extras;android;m2repository;38" \ - "extras;android;m2repository;39" \ - "extras;android;m2repository;4" \ - "extras;android;m2repository;40" \ - "extras;android;m2repository;41" \ - "extras;android;m2repository;42" \ - "extras;android;m2repository;43" \ - "extras;android;m2repository;44" \ - "extras;android;m2repository;45" \ - "extras;android;m2repository;46" \ - "extras;android;m2repository;47" \ - "extras;android;m2repository;6" \ - "extras;android;m2repository;7" \ - "extras;android;m2repository;8" \ - "extras;android;m2repository;9" - -RUN sdkmanager --install \ - "platform-tools" \ - "platform-tools;24.0.0" \ - "platform-tools;29.0.5" \ - "platform-tools;29.0.6" \ - "platform-tools;30.0.0" \ - "platform-tools;30.0.1" \ - "platform-tools;30.0.2" \ - "platform-tools;30.0.3" \ - "platform-tools;30.0.4" \ - "platform-tools;30.0.5" \ - "platform-tools;31.0.0" \ - "platform-tools;31.0.1" \ - "platform-tools;31.0.2" \ - "platform-tools;31.0.3" \ - "platform-tools;32.0.0" \ - "platform-tools;33.0.0" \ - "platform-tools;33.0.1" \ - "platform-tools;33.0.2" \ - "platform-tools;33.0.3" \ - "platform-tools;34.0.0" \ - "platform-tools;34.0.1" \ - "platform-tools;34.0.3" - -RUN sdkmanager --install \ - "platforms;android-10" \ - "platforms;android-11" \ - "platforms;android-12" \ - "platforms;android-13" \ - "platforms;android-14" \ - "platforms;android-15" \ - "platforms;android-16" \ - "platforms;android-17" \ - "platforms;android-18" \ - "platforms;android-19" \ - "platforms;android-20" \ - "platforms;android-21" \ - "platforms;android-22" \ - "platforms;android-23" \ - "platforms;android-24" \ - "platforms;android-25" \ - "platforms;android-26" \ - "platforms;android-27" \ - "platforms;android-28" \ - "platforms;android-29" \ - "platforms;android-3" \ - "platforms;android-30" \ - "platforms;android-31" \ - "platforms;android-32" \ - "platforms;android-33" \ - "platforms;android-34" \ - "platforms;android-4" \ - "platforms;android-5" \ - "platforms;android-6" \ - "platforms;android-7" \ - "platforms;android-8" \ - "platforms;android-9" - -RUN sdkmanager --install \ -# "ndk-bundle;11.0.2655954" \ -# "ndk-bundle;11.1.2683735" \ -# "ndk-bundle;11.2.2725575" \ -# "ndk-bundle;12.0.2931149" \ -# "ndk-bundle;12.1.2977051" \ -# "ndk-bundle;13.0.3315539" \ -# "ndk-bundle;13.1.3345770" \ -# "ndk-bundle;14.0.3770861" \ -# "ndk-bundle;14.1.3816874" \ -# "ndk-bundle;15.0.4075724" \ -# "ndk-bundle;15.1.4119039" \ -# "ndk-bundle;15.2.4203891" \ -# "ndk-bundle;16.0.4442984" \ -# "ndk-bundle;16.1.4479499" \ -# "ndk-bundle;17.0.4754217" \ -# "ndk-bundle;17.1.4828580" \ -# "ndk-bundle;17.2.4988734" \ -# "ndk-bundle;18.1.5063045" \ -# "ndk-bundle;19.0.5232133" \ -# "ndk-bundle;19.1.5304403" \ -# "ndk-bundle;19.2.5345600" \ -# "ndk-bundle;20.0.5392854-beta2" \ -# "ndk-bundle;20.0.5471264-beta3" \ -# "ndk-bundle;20.0.5594570" \ -# "ndk-bundle;20.1.5948944" \ -# "ndk-bundle;21.0.6011959-beta2" \ -# "ndk-bundle;21.0.6113669" \ -# "ndk-bundle;21.1.6210238-beta1" \ -# "ndk-bundle;21.1.6273396-beta2" \ -# "ndk-bundle;21.1.6352462" \ -# "ndk-bundle;21.1.6363665-beta3" \ -# "ndk-bundle;21.2.6472646" \ -# "ndk-bundle;21.3.6528147" \ -# "ndk-bundle;21.4.7075529" \ -# "ndk-bundle;22.0.6917172-beta1" \ -# "ndk-bundle;22.0.7026061" \ -# "ndk-bundle;22.1.7171670" \ -# "ndk-bundle;23.0.7123448-beta1" \ -# "ndk-bundle;23.0.7196353-beta2" \ -# "ndk-bundle;23.0.7272597-beta3" \ -# "ndk-bundle;23.0.7344513-beta4" \ -# "ndk-bundle;23.0.7421159-beta5" \ -# "ndk-bundle;23.0.7530507-beta6" \ -# "ndk-bundle;23.0.7599858" \ -# "ndk-bundle;23.1.7779620" \ -# "ndk-bundle;23.2.8568313" \ -# "ndk-bundle;24.0.7856742-beta1" \ -# "ndk-bundle;24.0.7956693-beta2" \ -# "ndk-bundle;24.0.8079956-beta3" \ -# "ndk-bundle;24.0.8215888" \ -# "ndk-bundle;25.0.8141415-beta1" \ -# "ndk-bundle;25.0.8221429-beta2" \ -# "ndk-bundle;25.0.8355429-beta3" \ -# "ndk-bundle;25.0.8528842-beta4" \ - "ndk-bundle;25.0.8775105" \ - "ndk-bundle;25.1.8937393" \ - "ndk-bundle;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk-bundle;r10e" \ -# "ndk-bundle;r11" \ -# "ndk-bundle;r11b" \ -# "ndk-bundle;r11c" \ -# "ndk-bundle;r12" \ -# "ndk-bundle;r12b" \ -# "ndk-bundle;r13" \ -# "ndk-bundle;r13b" \ -# "ndk-bundle;r14" \ -# "ndk-bundle;r14b" \ -# "ndk-bundle;r15" \ -# "ndk-bundle;r15b" \ -# "ndk-bundle;r15c" \ -# "ndk-bundle;r16" \ -# "ndk-bundle;r16b" \ -# "ndk-bundle;r17" \ -# "ndk-bundle;r17b" \ -# "ndk-bundle;r17c" \ -# "ndk-bundle;r18b" \ -# "ndk-bundle;r19" \ -# "ndk-bundle;r19b" \ -# "ndk-bundle;r19c" \ -# "ndk-bundle;r20" \ -# "ndk-bundle;r20-beta2" \ -# "ndk-bundle;r20-beta3" \ -# "ndk-bundle;r20b" \ -# "ndk-bundle;r21" \ -# "ndk-bundle;r21-beta2" \ -# "ndk-bundle;r21b" \ -# "ndk-bundle;r21b-beta1" \ -# "ndk-bundle;r21b-beta2" \ -# "ndk-bundle;r21b-beta3" \ -# "ndk-bundle;r21c" \ -# "ndk-bundle;r21d" \ -# "ndk-bundle;r21e" \ -# "ndk-bundle;r22" \ -# "ndk-bundle;r22-beta1" \ -# "ndk-bundle;r22b" \ -# "ndk-bundle;r23" \ -# "ndk-bundle;r23-beta1" \ -# "ndk-bundle;r23-beta2" \ -# "ndk-bundle;r23-beta3" \ -# "ndk-bundle;r23-beta4" \ -# "ndk-bundle;r23-beta5" \ -# "ndk-bundle;r23-beta6" \ -# "ndk-bundle;r23b" \ -# "ndk-bundle;r23c" \ -# "ndk-bundle;r24" \ -# "ndk-bundle;r24-beta1" \ -# "ndk-bundle;r24-beta2" \ -# "ndk-bundle;r24-rc1" \ - "ndk-bundle;r25" \ -# "ndk-bundle;r25-beta1" \ -# "ndk-bundle;r25-beta2" \ -# "ndk-bundle;r25-beta3" \ -# "ndk-bundle;r25-beta4" \ -# "ndk-bundle;r25b" \ - "ndk-bundle;r25c" - -RUN sdkmanager --install \ -# "ndk;11.0.2655954" \ -# "ndk;11.1.2683735" \ -# "ndk;11.2.2725575" \ -# "ndk;12.0.2931149" \ -# "ndk;12.1.2977051" \ -# "ndk;13.0.3315539" \ -# "ndk;13.1.3345770" \ -# "ndk;14.0.3770861" \ -# "ndk;14.1.3816874" \ -# "ndk;15.0.4075724" \ -# "ndk;15.1.4119039" \ -# "ndk;15.2.4203891" \ -# "ndk;16.0.4442984" \ -# "ndk;16.1.4479499" \ -# "ndk;17.0.4754217" \ -# "ndk;17.1.4828580" \ -# "ndk;17.2.4988734" \ -# "ndk;18.1.5063045" \ -# "ndk;19.0.5232133" \ -# "ndk;19.1.5304403" \ -# "ndk;19.2.5345600" \ -# "ndk;20.0.5392854-beta2" \ -# "ndk;20.0.5471264-beta3" \ -# "ndk;20.0.5594570" \ -# "ndk;20.1.5948944" \ -# "ndk;21.0.6011959-beta2" \ -# "ndk;21.0.6113669" \ -# "ndk;21.1.6210238-beta1" \ -# "ndk;21.1.6273396-beta2" \ -# "ndk;21.1.6352462" \ -# "ndk;21.1.6363665-beta3" \ -# "ndk;21.2.6472646" \ -# "ndk;21.3.6528147" \ -# "ndk;21.4.7075529" \ -# "ndk;22.0.6917172-beta1" \ -# "ndk;22.0.7026061" \ -# "ndk;22.1.7171670" \ -# "ndk;23.0.7123448-beta1" \ -# "ndk;23.0.7196353-beta2" \ -# "ndk;23.0.7272597-beta3" \ -# "ndk;23.0.7344513-beta4" \ -# "ndk;23.0.7421159-beta5" \ -# "ndk;23.0.7530507-beta6" \ -# "ndk;23.0.7599858" \ -# "ndk;23.1.7779620" \ -# "ndk;23.2.8568313" \ -# "ndk;24.0.7856742-beta1" \ -# "ndk;24.0.7956693-beta2" \ -# "ndk;24.0.8079956-beta3" \ -# "ndk;24.0.8215888" \ -# "ndk;25.0.8141415-beta1" \ -# "ndk;25.0.8221429-beta2" \ -# "ndk;25.0.8355429-beta3" \ -# "ndk;25.0.8528842-beta4" \ - "ndk;25.0.8775105" \ - "ndk;25.1.8937393" \ - "ndk;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk;r10e" \ -# "ndk;r11" \ -# "ndk;r11b" \ -# "ndk;r11c" \ -# "ndk;r12" \ -# "ndk;r12b" \ -# "ndk;r13" \ -# "ndk;r13b" \ -# "ndk;r14" \ -# "ndk;r14b" \ -# "ndk;r15" \ -# "ndk;r15b" \ -# "ndk;r15c" \ -# "ndk;r16" \ -# "ndk;r16b" \ -# "ndk;r17" \ -# "ndk;r17b" \ -# "ndk;r17c" \ -# "ndk;r18b" \ -# "ndk;r19" \ -# "ndk;r19b" \ -# "ndk;r19c" \ -# "ndk;r20" \ -# "ndk;r20-beta2" \ -# "ndk;r20-beta3" \ -# "ndk;r20b" \ -# "ndk;r21" \ -# "ndk;r21-beta2" \ -# "ndk;r21b" \ -# "ndk;r21b-beta1" \ -# "ndk;r21b-beta2" \ -# "ndk;r21b-beta3" \ -# "ndk;r21c" \ -# "ndk;r21d" \ -# "ndk;r21e" \ -# "ndk;r22" \ -# "ndk;r22-beta1" \ -# "ndk;r22b" \ -# "ndk;r23" \ -# "ndk;r23-beta1" \ -# "ndk;r23-beta2" \ -# "ndk;r23-beta3" \ -# "ndk;r23-beta4" \ -# "ndk;r23-beta5" \ -# "ndk;r23-beta6" \ -# "ndk;r23b" \ -# "ndk;r23c" \ -# "ndk;r24" \ -# "ndk;r24-beta1" \ -# "ndk;r24-beta2" \ -# "ndk;r24-rc1" \ - "ndk;r25" \ -# "ndk;r25-beta1" \ -# "ndk;r25-beta2" \ -# "ndk;r25-beta3" \ -# "ndk;r25-beta4" \ -# "ndk;r25b" \ - "ndk;r25c" - -RUN sdkmanager --install \ - "tools" \ - "tools;20.0.1" \ - "tools;20.0.3" \ - "tools;21.0.1" \ - "tools;22.0.1" \ - "tools;22.0.4" \ - "tools;22.0.5" \ - "tools;22.2.1" \ - "tools;22.6.1" \ - "tools;22.6.2" \ - "tools;22.6.3" \ - "tools;22.6.4" \ - "tools;23.0.1" \ - "tools;23.0.2" \ - "tools;23.0.4" \ - "tools;23.0.5" \ - "tools;24.0.1" \ - "tools;24.0.2" \ - "tools;24.1.2" \ - "tools;24.3.1" \ - "tools;24.3.2" \ - "tools;24.3.3" \ - "tools;24.3.4" \ - "tools;24.4.1" \ - "tools;25.0.1" \ - "tools;25.0.2" \ - "tools;25.0.3" \ - "tools;25.0.4" \ - "tools;25.0.5" \ - "tools;25.0.6" \ - "tools;25.0.7" \ - "tools;25.0.8" \ - "tools;25.0.9" \ - "tools;25.1.0" \ - "tools;25.1.1" \ - "tools;25.1.2" \ - "tools;25.1.3" \ - "tools;25.1.4" \ - "tools;25.1.5" \ - "tools;25.1.6" \ - "tools;25.1.7" \ - "tools;25.2.1" \ - "tools;25.2.2" \ - "tools;25.2.3" \ - "tools;25.2.4" \ - "tools;25.2.5" \ - "tools;26.1.1" - -# Activate android sdk -#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license -#RUN rm -rfv /usr/lib/android-sdk/licenses/* -RUN yes | sdkmanager --licenses -RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/sdkman.sh b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/sdkman.sh deleted file mode 100755 index 59b74df1e..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/sdkman.sh +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Marco Vermeulen -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# install:- channel: stable; cliVersion: 5.15.0; cliNativeVersion: NA; api: https://api.sdkman.io/2 - -# Global variables -SDKMAN_SERVICE="https://api.sdkman.io/2" -SDKMAN_VERSION="5.15.0" -SDKMAN_PLATFORM=$(uname) - -if [ -z "$SDKMAN_DIR" ]; then - SDKMAN_DIR="$HOME/.sdkman" - SDKMAN_DIR_RAW='$HOME/.sdkman' -else - SDKMAN_DIR_RAW="$SDKMAN_DIR" -fi - -# Local variables -sdkman_tmp_folder="${SDKMAN_DIR}/tmp" -sdkman_zip_file="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}.zip" -sdkman_zip_base_folder="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}" -sdkman_ext_folder="${SDKMAN_DIR}/ext" -sdkman_etc_folder="${SDKMAN_DIR}/etc" -sdkman_var_folder="${SDKMAN_DIR}/var" -sdkman_archives_folder="${SDKMAN_DIR}/archives" -sdkman_candidates_folder="${SDKMAN_DIR}/candidates" -sdkman_config_file="${sdkman_etc_folder}/config" -sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" -sdkman_bashrc="${HOME}/.bashrc" -sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc" - -sdkman_init_snippet=$( cat << EOF -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$SDKMAN_DIR_RAW" -[[ -s "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" -EOF -) - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -solaris=false; -freebsd=false; -case "$(uname)" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - SunOS*) - solaris=true - ;; - FreeBSD*) - freebsd=true -esac - -echo '' -echo ' -+syyyyyyys:' -echo ' `/yho:` -yd.' -echo ' `/yh/` +m.' -echo ' .oho. hy .`' -echo ' .sh/` :N` `-/o` `+dyyo:.' -echo ' .yh:` `M- `-/osysoym :hs` `-+sys: hhyssssssssy+' -echo ' .sh:` `N: ms/-`` yy.yh- -hy. `.N-````````+N.' -echo ' `od/` `N- -/oM- ddd+` `sd: hNNm -N:' -echo ' :do` .M. dMMM- `ms. /d+` `NMMs `do' -echo ' .yy- :N` ```mMMM. - -hy. /MMM: yh' -echo ' `+d+` `:/oo/` `-/osyh/ossssssdNMM` .sh: yMMN` /m.' -echo ' -dh- :ymNMMMMy `-/shmNm-`:N/-.`` `.sN /N- `NMMy .m/' -echo ' `oNs` -hysosmMMMMydmNmds+-.:ohm : sd` :MMM/ yy' -echo ' .hN+ /d: -MMMmhs/-.` .MMMh .ss+- `yy` sMMN` :N.' -echo ' :mN/ `N/ `o/-` :MMMo +MMMN- .` `ds mMMh do' -echo ' /NN/ `N+....--:/+oooosooo+:sMMM: hMMMM: `my .m+ -MMM+ :N.' -echo ' /NMo -+ooooo+/:-....`...:+hNMN. `NMMMd` .MM/ -m: oMMN. hs' -echo ' -NMd` :mm -MMMm- .s/ -MMm. /m- mMMd -N.' -echo ' `mMM/ .- /MMh. -dMo -MMMy od. .MMMs..---yh' -echo ' +MMM. sNo`.sNMM+ :MMMM/ sh`+MMMNmNm+++-' -echo ' mMMM- /--ohmMMM+ :MMMMm. `hyymmmdddo' -echo ' MMMMh. ```` `-+yy/`yMMM/ :MMMMMy -sm:.``..-:-.`' -echo ' dMMMMmo-.``````..-:/osyhddddho. `+shdh+. hMMM: :MmMMMM/ ./yy/` `:sys+/+sh/' -echo ' .dMMMMMMmdddddmmNMMMNNNNNMMMMMs sNdo- dMMM- `-/yd/MMMMm-:sy+. :hs- /N`' -echo ' `/ymNNNNNNNmmdys+/::----/dMMm: +m- mMMM+ohmo/.` sMMMMdo- .om: `sh' -echo ' `.-----+/.` `.-+hh/` `od. NMMNmds/ `mmy:` +mMy `:yy.' -echo ' /moyso+//+ossso:. .yy` `dy+:` .. :MMMN+---/oys:' -echo ' /+m: `.-:::-` /d+ +MMMMMMMNh:`' -echo ' +MN/ -yh. `+hddhy+.' -echo ' /MM+ .sh:' -echo ' :NMo -sh/' -echo ' -NMs `/yy:' -echo ' .NMy `:sh+.' -echo ' `mMm` ./yds-' -echo ' `dMMMmyo:-.````.-:oymNy:`' -echo ' +NMMMMMMMMMMMMMMMMms:`' -echo ' -+shmNMMMNmdy+:`' -echo '' -echo '' -echo ' Now attempting installation...' -echo '' -echo '' - -# Sanity checks - -echo "Looking for a previous installation of SDKMAN..." -if [ -d "$SDKMAN_DIR" ]; then - echo "SDKMAN found." - echo "" - echo "======================================================================================================" - echo " You already have SDKMAN installed." - echo " SDKMAN was found at:" - echo "" - echo " ${SDKMAN_DIR}" - echo "" - echo " Please consider running the following if you need to upgrade." - echo "" - echo " $ sdk selfupdate force" - echo "" - echo "======================================================================================================" - echo "" - exit 0 -fi - -echo "Looking for unzip..." -if ! command -v unzip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install unzip on your system using your favourite package manager." - echo "" - echo " Restart after installing unzip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for zip..." -if ! command -v zip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install zip on your system using your favourite package manager." - echo "" - echo " Restart after installing zip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for curl..." -if ! command -v curl > /dev/null; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install curl on your system using your favourite package manager." - echo "" - echo " Restart after installing curl." - echo "======================================================================================================" - echo "" - exit 1 -fi - -if [[ "$solaris" == true ]]; then - echo "Looking for gsed..." - if [ -z $(which gsed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install gsed on your solaris system." - echo "" - echo " SDKMAN uses gsed extensively." - echo "" - echo " Restart after installing gsed." - echo "======================================================================================================" - echo "" - exit 1 - fi -else - echo "Looking for sed..." - if [ -z $(command -v sed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install sed on your system using your favourite package manager." - echo "" - echo " Restart after installing sed." - echo "======================================================================================================" - echo "" - exit 1 - fi -fi - -echo "Installing SDKMAN scripts..." - - -# Create directory structure - -echo "Create distribution directories..." -mkdir -p "$sdkman_tmp_folder" -mkdir -p "$sdkman_ext_folder" -mkdir -p "$sdkman_etc_folder" -mkdir -p "$sdkman_var_folder" -mkdir -p "$sdkman_archives_folder" -mkdir -p "$sdkman_candidates_folder" - -echo "Getting available candidates..." -SDKMAN_CANDIDATES_CSV=$(curl -s "${SDKMAN_SERVICE}/candidates/all") -echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" - -echo "Prime the config file..." -touch "$sdkman_config_file" -echo "sdkman_auto_answer=false" >> "$sdkman_config_file" -if [ -z "$ZSH_VERSION" -a -z "$BASH_VERSION" ]; then - echo "sdkman_auto_complete=false" >> "$sdkman_config_file" -else - echo "sdkman_auto_complete=true" >> "$sdkman_config_file" -fi -echo "sdkman_auto_env=false" >> "$sdkman_config_file" -echo "sdkman_auto_update=true" >> "$sdkman_config_file" -echo "sdkman_beta_channel=false" >> "$sdkman_config_file" -echo "sdkman_checksum_enable=true" >> "$sdkman_config_file" -echo "sdkman_colour_enable=true" >> "$sdkman_config_file" -echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file" -echo "sdkman_curl_max_time=10" >> "$sdkman_config_file" -echo "sdkman_debug_mode=false" >> "$sdkman_config_file" -echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file" -echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file" -echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file" - -echo "Download script archive..." -curl --location --progress-bar "${SDKMAN_SERVICE}/broker/download/sdkman/install/${SDKMAN_VERSION}/${SDKMAN_PLATFORM}" > "$sdkman_zip_file" - -ARCHIVE_OK=$(unzip -qt "$sdkman_zip_file" | grep 'No errors detected in compressed data') -if [[ -z "$ARCHIVE_OK" ]]; then - echo "Downloaded zip archive corrupt. Are you connected to the internet?" - echo "" - echo "If problems persist, please ask for help on our Slack:" - echo "* easy sign up: https://slack.sdkman.io/" - echo "* report on channel: https://sdkman.slack.com/app_redirect?channel=user-issues" - rm -rf "$SDKMAN_DIR" - exit 1 -fi - -echo "Extract script archive..." -if [[ "$cygwin" == 'true' ]]; then - echo "Cygwin detected - normalizing paths for unzip..." - sdkman_tmp_folder=$(cygpath -w "$sdkman_tmp_folder") - sdkman_zip_file=$(cygpath -w "$sdkman_zip_file") - sdkman_zip_base_folder=$(cygpath -w "$sdkman_zip_base_folder") -fi -unzip -qo "$sdkman_zip_file" -d "$sdkman_tmp_folder" - -echo "Install scripts..." -mv "${sdkman_zip_base_folder}/"* "$SDKMAN_DIR" -rm -rf "$sdkman_zip_base_folder" - -echo "Set version to $SDKMAN_VERSION ..." -echo "$SDKMAN_VERSION" > "${SDKMAN_DIR}/var/version" - - -if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" - echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" - echo "Added sdkman init snippet to $sdkman_bash_profile" - fi -else - echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" - echo "Added sdkman init snippet to $sdkman_bashrc" - fi -fi - -echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" - echo "Updated existing ${sdkman_zshrc}" -fi - - - -echo -e "\n\n\nAll done!\n\n" - -echo "You are subscribed to the STABLE channel." - -echo "" -echo "Please open a new terminal, or run the following in the existing one:" -echo "" -echo " source \"${SDKMAN_DIR}/bin/sdkman-init.sh\"" -echo "" -echo "Then issue the following command:" -echo "" -echo " sdk help" -echo "" -echo "Enjoy!!!" diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/Dockerfile deleted file mode 100644 index f48e1cfe7..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/Dockerfile +++ /dev/null @@ -1,553 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-develop-jdk8 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# Android SDK -################################################################## -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - maven \ - android-sdk \ - sdkmanager \ - android-sdk-build-tools \ - android-sdk-platform-tools-common \ - android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ - apt remove -y gradle && \ - sdkmanager --version && \ - mvn -v - -# Install ALL ANDROID SDK -RUN sdkmanager --install \ - "build-tools;17.0.0" \ - "build-tools;18.0.0" \ - "build-tools;18.0.1" \ - "build-tools;18.1.0" \ - "build-tools;18.1.1" \ - "build-tools;19.0.0" \ - "build-tools;19.0.1" \ - "build-tools;19.0.2" \ - "build-tools;19.0.3" \ - "build-tools;19.1.0" \ - "build-tools;20.0.0" \ - "build-tools;21.0.0" \ - "build-tools;21.0.1" \ - "build-tools;21.0.2" \ - "build-tools;21.1.0" \ - "build-tools;21.1.1" \ - "build-tools;21.1.2" \ - "build-tools;22.0.0" \ - "build-tools;22.0.1" \ - "build-tools;23.0.0" \ - "build-tools;23.0.1" \ - "build-tools;23.0.2" \ - "build-tools;23.0.3" \ - "build-tools;24.0.0" \ - "build-tools;24.0.1" \ - "build-tools;24.0.2" \ - "build-tools;24.0.3" \ - "build-tools;25.0.0" \ - "build-tools;25.0.1" \ - "build-tools;25.0.2" \ - "build-tools;25.0.3" \ - "build-tools;26.0.0" \ - "build-tools;26.0.0-rc1" \ - "build-tools;26.0.0-rc2" \ - "build-tools;26.0.1" \ - "build-tools;26.0.2" \ - "build-tools;26.0.3" \ - "build-tools;27.0.0" \ - "build-tools;27.0.1" \ - "build-tools;27.0.2" \ - "build-tools;27.0.3" \ - "build-tools;28.0.0" \ - "build-tools;28.0.0-rc1" \ - "build-tools;28.0.0-rc2" \ - "build-tools;28.0.1" \ - "build-tools;28.0.2" \ - "build-tools;28.0.3" \ - "build-tools;29.0.0" \ - "build-tools;29.0.0-rc1" \ - "build-tools;29.0.0-rc2" \ - "build-tools;29.0.0-rc3" \ - "build-tools;29.0.1" \ - "build-tools;29.0.2" \ - "build-tools;29.0.3" \ - "build-tools;30.0.0" \ - "build-tools;30.0.0-rc1" \ - "build-tools;30.0.0-rc2" \ - "build-tools;30.0.0-rc3" \ - "build-tools;30.0.0-rc4" \ - "build-tools;30.0.1" \ - "build-tools;30.0.2" \ - "build-tools;30.0.3" \ - "build-tools;31.0.0" \ - "build-tools;31.0.0-rc1" \ - "build-tools;31.0.0-rc2" \ - "build-tools;31.0.0-rc3" \ - "build-tools;31.0.0-rc4" \ - "build-tools;31.0.0-rc5" \ - "build-tools;32.0.0" \ - "build-tools;32.1.0-rc1" \ - "build-tools;33.0.0" \ - "build-tools;33.0.0-rc1" \ - "build-tools;33.0.0-rc2" \ - "build-tools;33.0.0-rc3" \ - "build-tools;33.0.0-rc4" \ - "build-tools;33.0.1" \ - "build-tools;33.0.2" \ - "build-tools;34.0.0" \ - "build-tools;34.0.0-rc1" \ - "build-tools;34.0.0-rc2" \ - "build-tools;34.0.0-rc3" \ - "build-tools;34.0.0-rc4" - - -RUN sdkmanager --install \ - "cmake;3.10.2.4988404" \ - "cmake;3.18.1" \ - "cmake;3.22.1" \ - "cmake;3.6.4111459" - -RUN sdkmanager --install \ - "cmdline-tools;1.0" \ - "cmdline-tools;1.0-alpha01" \ - "cmdline-tools;10.0-beta04" \ - "cmdline-tools;11.0-alpha07" \ - "cmdline-tools;2.0" \ - "cmdline-tools;2.0-rc01" \ - "cmdline-tools;2.1" \ - "cmdline-tools;3.0" \ - "cmdline-tools;3.0-beta01" \ - "cmdline-tools;4.0" \ - "cmdline-tools;4.0-alpha02" \ - "cmdline-tools;4.0-beta01" \ - "cmdline-tools;5.0" \ - "cmdline-tools;5.0-alpha01" \ - "cmdline-tools;6.0" \ - "cmdline-tools;7.0" \ - "cmdline-tools;8.0" \ - "cmdline-tools;9.0" \ - "cmdline-tools;latest" - -RUN sdkmanager --install \ - "extras;android;m2repository" \ - "extras;android;m2repository;01" \ - "extras;android;m2repository;02" \ - "extras;android;m2repository;03" \ - "extras;android;m2repository;04" \ - "extras;android;m2repository;06" \ - "extras;android;m2repository;07" \ - "extras;android;m2repository;08" \ - "extras;android;m2repository;09" \ - "extras;android;m2repository;1" \ - "extras;android;m2repository;10" \ - "extras;android;m2repository;11" \ - "extras;android;m2repository;12" \ - "extras;android;m2repository;13" \ - "extras;android;m2repository;14" \ - "extras;android;m2repository;15" \ - "extras;android;m2repository;16" \ - "extras;android;m2repository;17" \ - "extras;android;m2repository;18" \ - "extras;android;m2repository;19" \ - "extras;android;m2repository;2" \ - "extras;android;m2repository;20" \ - "extras;android;m2repository;21" \ - "extras;android;m2repository;22" \ - "extras;android;m2repository;23" \ - "extras;android;m2repository;24" \ - "extras;android;m2repository;25" \ - "extras;android;m2repository;26" \ - "extras;android;m2repository;27" \ - "extras;android;m2repository;28" \ - "extras;android;m2repository;29" \ - "extras;android;m2repository;3" \ - "extras;android;m2repository;30" \ - "extras;android;m2repository;31" \ - "extras;android;m2repository;32" \ - "extras;android;m2repository;33" \ - "extras;android;m2repository;34" \ - "extras;android;m2repository;35" \ - "extras;android;m2repository;36" \ - "extras;android;m2repository;37" \ - "extras;android;m2repository;38" \ - "extras;android;m2repository;39" \ - "extras;android;m2repository;4" \ - "extras;android;m2repository;40" \ - "extras;android;m2repository;41" \ - "extras;android;m2repository;42" \ - "extras;android;m2repository;43" \ - "extras;android;m2repository;44" \ - "extras;android;m2repository;45" \ - "extras;android;m2repository;46" \ - "extras;android;m2repository;47" \ - "extras;android;m2repository;6" \ - "extras;android;m2repository;7" \ - "extras;android;m2repository;8" \ - "extras;android;m2repository;9" - -RUN sdkmanager --install \ - "platform-tools" \ - "platform-tools;24.0.0" \ - "platform-tools;29.0.5" \ - "platform-tools;29.0.6" \ - "platform-tools;30.0.0" \ - "platform-tools;30.0.1" \ - "platform-tools;30.0.2" \ - "platform-tools;30.0.3" \ - "platform-tools;30.0.4" \ - "platform-tools;30.0.5" \ - "platform-tools;31.0.0" \ - "platform-tools;31.0.1" \ - "platform-tools;31.0.2" \ - "platform-tools;31.0.3" \ - "platform-tools;32.0.0" \ - "platform-tools;33.0.0" \ - "platform-tools;33.0.1" \ - "platform-tools;33.0.2" \ - "platform-tools;33.0.3" \ - "platform-tools;34.0.0" \ - "platform-tools;34.0.1" \ - "platform-tools;34.0.3" - -RUN sdkmanager --install \ - "platforms;android-10" \ - "platforms;android-11" \ - "platforms;android-12" \ - "platforms;android-13" \ - "platforms;android-14" \ - "platforms;android-15" \ - "platforms;android-16" \ - "platforms;android-17" \ - "platforms;android-18" \ - "platforms;android-19" \ - "platforms;android-20" \ - "platforms;android-21" \ - "platforms;android-22" \ - "platforms;android-23" \ - "platforms;android-24" \ - "platforms;android-25" \ - "platforms;android-26" \ - "platforms;android-27" \ - "platforms;android-28" \ - "platforms;android-29" \ - "platforms;android-3" \ - "platforms;android-30" \ - "platforms;android-31" \ - "platforms;android-32" \ - "platforms;android-33" \ - "platforms;android-34" \ - "platforms;android-4" \ - "platforms;android-5" \ - "platforms;android-6" \ - "platforms;android-7" \ - "platforms;android-8" \ - "platforms;android-9" - -RUN sdkmanager --install \ -# "ndk-bundle;11.0.2655954" \ -# "ndk-bundle;11.1.2683735" \ -# "ndk-bundle;11.2.2725575" \ -# "ndk-bundle;12.0.2931149" \ -# "ndk-bundle;12.1.2977051" \ -# "ndk-bundle;13.0.3315539" \ -# "ndk-bundle;13.1.3345770" \ -# "ndk-bundle;14.0.3770861" \ -# "ndk-bundle;14.1.3816874" \ -# "ndk-bundle;15.0.4075724" \ -# "ndk-bundle;15.1.4119039" \ -# "ndk-bundle;15.2.4203891" \ -# "ndk-bundle;16.0.4442984" \ -# "ndk-bundle;16.1.4479499" \ -# "ndk-bundle;17.0.4754217" \ -# "ndk-bundle;17.1.4828580" \ -# "ndk-bundle;17.2.4988734" \ -# "ndk-bundle;18.1.5063045" \ -# "ndk-bundle;19.0.5232133" \ -# "ndk-bundle;19.1.5304403" \ -# "ndk-bundle;19.2.5345600" \ -# "ndk-bundle;20.0.5392854-beta2" \ -# "ndk-bundle;20.0.5471264-beta3" \ -# "ndk-bundle;20.0.5594570" \ -# "ndk-bundle;20.1.5948944" \ -# "ndk-bundle;21.0.6011959-beta2" \ -# "ndk-bundle;21.0.6113669" \ -# "ndk-bundle;21.1.6210238-beta1" \ -# "ndk-bundle;21.1.6273396-beta2" \ -# "ndk-bundle;21.1.6352462" \ -# "ndk-bundle;21.1.6363665-beta3" \ -# "ndk-bundle;21.2.6472646" \ -# "ndk-bundle;21.3.6528147" \ -# "ndk-bundle;21.4.7075529" \ -# "ndk-bundle;22.0.6917172-beta1" \ -# "ndk-bundle;22.0.7026061" \ -# "ndk-bundle;22.1.7171670" \ -# "ndk-bundle;23.0.7123448-beta1" \ -# "ndk-bundle;23.0.7196353-beta2" \ -# "ndk-bundle;23.0.7272597-beta3" \ -# "ndk-bundle;23.0.7344513-beta4" \ -# "ndk-bundle;23.0.7421159-beta5" \ -# "ndk-bundle;23.0.7530507-beta6" \ -# "ndk-bundle;23.0.7599858" \ -# "ndk-bundle;23.1.7779620" \ -# "ndk-bundle;23.2.8568313" \ -# "ndk-bundle;24.0.7856742-beta1" \ -# "ndk-bundle;24.0.7956693-beta2" \ -# "ndk-bundle;24.0.8079956-beta3" \ -# "ndk-bundle;24.0.8215888" \ -# "ndk-bundle;25.0.8141415-beta1" \ -# "ndk-bundle;25.0.8221429-beta2" \ -# "ndk-bundle;25.0.8355429-beta3" \ -# "ndk-bundle;25.0.8528842-beta4" \ - "ndk-bundle;25.0.8775105" \ - "ndk-bundle;25.1.8937393" \ - "ndk-bundle;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk-bundle;r10e" \ -# "ndk-bundle;r11" \ -# "ndk-bundle;r11b" \ -# "ndk-bundle;r11c" \ -# "ndk-bundle;r12" \ -# "ndk-bundle;r12b" \ -# "ndk-bundle;r13" \ -# "ndk-bundle;r13b" \ -# "ndk-bundle;r14" \ -# "ndk-bundle;r14b" \ -# "ndk-bundle;r15" \ -# "ndk-bundle;r15b" \ -# "ndk-bundle;r15c" \ -# "ndk-bundle;r16" \ -# "ndk-bundle;r16b" \ -# "ndk-bundle;r17" \ -# "ndk-bundle;r17b" \ -# "ndk-bundle;r17c" \ -# "ndk-bundle;r18b" \ -# "ndk-bundle;r19" \ -# "ndk-bundle;r19b" \ -# "ndk-bundle;r19c" \ -# "ndk-bundle;r20" \ -# "ndk-bundle;r20-beta2" \ -# "ndk-bundle;r20-beta3" \ -# "ndk-bundle;r20b" \ -# "ndk-bundle;r21" \ -# "ndk-bundle;r21-beta2" \ -# "ndk-bundle;r21b" \ -# "ndk-bundle;r21b-beta1" \ -# "ndk-bundle;r21b-beta2" \ -# "ndk-bundle;r21b-beta3" \ -# "ndk-bundle;r21c" \ -# "ndk-bundle;r21d" \ -# "ndk-bundle;r21e" \ -# "ndk-bundle;r22" \ -# "ndk-bundle;r22-beta1" \ -# "ndk-bundle;r22b" \ -# "ndk-bundle;r23" \ -# "ndk-bundle;r23-beta1" \ -# "ndk-bundle;r23-beta2" \ -# "ndk-bundle;r23-beta3" \ -# "ndk-bundle;r23-beta4" \ -# "ndk-bundle;r23-beta5" \ -# "ndk-bundle;r23-beta6" \ -# "ndk-bundle;r23b" \ -# "ndk-bundle;r23c" \ -# "ndk-bundle;r24" \ -# "ndk-bundle;r24-beta1" \ -# "ndk-bundle;r24-beta2" \ -# "ndk-bundle;r24-rc1" \ - "ndk-bundle;r25" \ -# "ndk-bundle;r25-beta1" \ -# "ndk-bundle;r25-beta2" \ -# "ndk-bundle;r25-beta3" \ -# "ndk-bundle;r25-beta4" \ -# "ndk-bundle;r25b" \ - "ndk-bundle;r25c" - -RUN sdkmanager --install \ -# "ndk;11.0.2655954" \ -# "ndk;11.1.2683735" \ -# "ndk;11.2.2725575" \ -# "ndk;12.0.2931149" \ -# "ndk;12.1.2977051" \ -# "ndk;13.0.3315539" \ -# "ndk;13.1.3345770" \ -# "ndk;14.0.3770861" \ -# "ndk;14.1.3816874" \ -# "ndk;15.0.4075724" \ -# "ndk;15.1.4119039" \ -# "ndk;15.2.4203891" \ -# "ndk;16.0.4442984" \ -# "ndk;16.1.4479499" \ -# "ndk;17.0.4754217" \ -# "ndk;17.1.4828580" \ -# "ndk;17.2.4988734" \ -# "ndk;18.1.5063045" \ -# "ndk;19.0.5232133" \ -# "ndk;19.1.5304403" \ -# "ndk;19.2.5345600" \ -# "ndk;20.0.5392854-beta2" \ -# "ndk;20.0.5471264-beta3" \ -# "ndk;20.0.5594570" \ -# "ndk;20.1.5948944" \ -# "ndk;21.0.6011959-beta2" \ -# "ndk;21.0.6113669" \ -# "ndk;21.1.6210238-beta1" \ -# "ndk;21.1.6273396-beta2" \ -# "ndk;21.1.6352462" \ -# "ndk;21.1.6363665-beta3" \ -# "ndk;21.2.6472646" \ -# "ndk;21.3.6528147" \ -# "ndk;21.4.7075529" \ -# "ndk;22.0.6917172-beta1" \ -# "ndk;22.0.7026061" \ -# "ndk;22.1.7171670" \ -# "ndk;23.0.7123448-beta1" \ -# "ndk;23.0.7196353-beta2" \ -# "ndk;23.0.7272597-beta3" \ -# "ndk;23.0.7344513-beta4" \ -# "ndk;23.0.7421159-beta5" \ -# "ndk;23.0.7530507-beta6" \ -# "ndk;23.0.7599858" \ -# "ndk;23.1.7779620" \ -# "ndk;23.2.8568313" \ -# "ndk;24.0.7856742-beta1" \ -# "ndk;24.0.7956693-beta2" \ -# "ndk;24.0.8079956-beta3" \ -# "ndk;24.0.8215888" \ -# "ndk;25.0.8141415-beta1" \ -# "ndk;25.0.8221429-beta2" \ -# "ndk;25.0.8355429-beta3" \ -# "ndk;25.0.8528842-beta4" \ - "ndk;25.0.8775105" \ - "ndk;25.1.8937393" \ - "ndk;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk;r10e" \ -# "ndk;r11" \ -# "ndk;r11b" \ -# "ndk;r11c" \ -# "ndk;r12" \ -# "ndk;r12b" \ -# "ndk;r13" \ -# "ndk;r13b" \ -# "ndk;r14" \ -# "ndk;r14b" \ -# "ndk;r15" \ -# "ndk;r15b" \ -# "ndk;r15c" \ -# "ndk;r16" \ -# "ndk;r16b" \ -# "ndk;r17" \ -# "ndk;r17b" \ -# "ndk;r17c" \ -# "ndk;r18b" \ -# "ndk;r19" \ -# "ndk;r19b" \ -# "ndk;r19c" \ -# "ndk;r20" \ -# "ndk;r20-beta2" \ -# "ndk;r20-beta3" \ -# "ndk;r20b" \ -# "ndk;r21" \ -# "ndk;r21-beta2" \ -# "ndk;r21b" \ -# "ndk;r21b-beta1" \ -# "ndk;r21b-beta2" \ -# "ndk;r21b-beta3" \ -# "ndk;r21c" \ -# "ndk;r21d" \ -# "ndk;r21e" \ -# "ndk;r22" \ -# "ndk;r22-beta1" \ -# "ndk;r22b" \ -# "ndk;r23" \ -# "ndk;r23-beta1" \ -# "ndk;r23-beta2" \ -# "ndk;r23-beta3" \ -# "ndk;r23-beta4" \ -# "ndk;r23-beta5" \ -# "ndk;r23-beta6" \ -# "ndk;r23b" \ -# "ndk;r23c" \ -# "ndk;r24" \ -# "ndk;r24-beta1" \ -# "ndk;r24-beta2" \ -# "ndk;r24-rc1" \ - "ndk;r25" \ -# "ndk;r25-beta1" \ -# "ndk;r25-beta2" \ -# "ndk;r25-beta3" \ -# "ndk;r25-beta4" \ -# "ndk;r25b" \ - "ndk;r25c" - -RUN sdkmanager --install \ - "tools" \ - "tools;20.0.1" \ - "tools;20.0.3" \ - "tools;21.0.1" \ - "tools;22.0.1" \ - "tools;22.0.4" \ - "tools;22.0.5" \ - "tools;22.2.1" \ - "tools;22.6.1" \ - "tools;22.6.2" \ - "tools;22.6.3" \ - "tools;22.6.4" \ - "tools;23.0.1" \ - "tools;23.0.2" \ - "tools;23.0.4" \ - "tools;23.0.5" \ - "tools;24.0.1" \ - "tools;24.0.2" \ - "tools;24.1.2" \ - "tools;24.3.1" \ - "tools;24.3.2" \ - "tools;24.3.3" \ - "tools;24.3.4" \ - "tools;24.4.1" \ - "tools;25.0.1" \ - "tools;25.0.2" \ - "tools;25.0.3" \ - "tools;25.0.4" \ - "tools;25.0.5" \ - "tools;25.0.6" \ - "tools;25.0.7" \ - "tools;25.0.8" \ - "tools;25.0.9" \ - "tools;25.1.0" \ - "tools;25.1.1" \ - "tools;25.1.2" \ - "tools;25.1.3" \ - "tools;25.1.4" \ - "tools;25.1.5" \ - "tools;25.1.6" \ - "tools;25.1.7" \ - "tools;25.2.1" \ - "tools;25.2.2" \ - "tools;25.2.3" \ - "tools;25.2.4" \ - "tools;25.2.5" \ - "tools;26.1.1" - -# Activate android sdk -#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license -#RUN rm -rfv /usr/lib/android-sdk/licenses/* -RUN yes | sdkmanager --licenses -RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/docker-compose.yml deleted file mode 100644 index 774836c9c..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - app: - image: "hub.epicm.org/epicmorg/debian:bookworm-android-sdk-jdk8" - build: - context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/sdkman.sh b/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/sdkman.sh deleted file mode 100755 index 59b74df1e..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/sdkman.sh +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Marco Vermeulen -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# install:- channel: stable; cliVersion: 5.15.0; cliNativeVersion: NA; api: https://api.sdkman.io/2 - -# Global variables -SDKMAN_SERVICE="https://api.sdkman.io/2" -SDKMAN_VERSION="5.15.0" -SDKMAN_PLATFORM=$(uname) - -if [ -z "$SDKMAN_DIR" ]; then - SDKMAN_DIR="$HOME/.sdkman" - SDKMAN_DIR_RAW='$HOME/.sdkman' -else - SDKMAN_DIR_RAW="$SDKMAN_DIR" -fi - -# Local variables -sdkman_tmp_folder="${SDKMAN_DIR}/tmp" -sdkman_zip_file="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}.zip" -sdkman_zip_base_folder="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}" -sdkman_ext_folder="${SDKMAN_DIR}/ext" -sdkman_etc_folder="${SDKMAN_DIR}/etc" -sdkman_var_folder="${SDKMAN_DIR}/var" -sdkman_archives_folder="${SDKMAN_DIR}/archives" -sdkman_candidates_folder="${SDKMAN_DIR}/candidates" -sdkman_config_file="${sdkman_etc_folder}/config" -sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" -sdkman_bashrc="${HOME}/.bashrc" -sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc" - -sdkman_init_snippet=$( cat << EOF -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$SDKMAN_DIR_RAW" -[[ -s "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" -EOF -) - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -solaris=false; -freebsd=false; -case "$(uname)" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - SunOS*) - solaris=true - ;; - FreeBSD*) - freebsd=true -esac - -echo '' -echo ' -+syyyyyyys:' -echo ' `/yho:` -yd.' -echo ' `/yh/` +m.' -echo ' .oho. hy .`' -echo ' .sh/` :N` `-/o` `+dyyo:.' -echo ' .yh:` `M- `-/osysoym :hs` `-+sys: hhyssssssssy+' -echo ' .sh:` `N: ms/-`` yy.yh- -hy. `.N-````````+N.' -echo ' `od/` `N- -/oM- ddd+` `sd: hNNm -N:' -echo ' :do` .M. dMMM- `ms. /d+` `NMMs `do' -echo ' .yy- :N` ```mMMM. - -hy. /MMM: yh' -echo ' `+d+` `:/oo/` `-/osyh/ossssssdNMM` .sh: yMMN` /m.' -echo ' -dh- :ymNMMMMy `-/shmNm-`:N/-.`` `.sN /N- `NMMy .m/' -echo ' `oNs` -hysosmMMMMydmNmds+-.:ohm : sd` :MMM/ yy' -echo ' .hN+ /d: -MMMmhs/-.` .MMMh .ss+- `yy` sMMN` :N.' -echo ' :mN/ `N/ `o/-` :MMMo +MMMN- .` `ds mMMh do' -echo ' /NN/ `N+....--:/+oooosooo+:sMMM: hMMMM: `my .m+ -MMM+ :N.' -echo ' /NMo -+ooooo+/:-....`...:+hNMN. `NMMMd` .MM/ -m: oMMN. hs' -echo ' -NMd` :mm -MMMm- .s/ -MMm. /m- mMMd -N.' -echo ' `mMM/ .- /MMh. -dMo -MMMy od. .MMMs..---yh' -echo ' +MMM. sNo`.sNMM+ :MMMM/ sh`+MMMNmNm+++-' -echo ' mMMM- /--ohmMMM+ :MMMMm. `hyymmmdddo' -echo ' MMMMh. ```` `-+yy/`yMMM/ :MMMMMy -sm:.``..-:-.`' -echo ' dMMMMmo-.``````..-:/osyhddddho. `+shdh+. hMMM: :MmMMMM/ ./yy/` `:sys+/+sh/' -echo ' .dMMMMMMmdddddmmNMMMNNNNNMMMMMs sNdo- dMMM- `-/yd/MMMMm-:sy+. :hs- /N`' -echo ' `/ymNNNNNNNmmdys+/::----/dMMm: +m- mMMM+ohmo/.` sMMMMdo- .om: `sh' -echo ' `.-----+/.` `.-+hh/` `od. NMMNmds/ `mmy:` +mMy `:yy.' -echo ' /moyso+//+ossso:. .yy` `dy+:` .. :MMMN+---/oys:' -echo ' /+m: `.-:::-` /d+ +MMMMMMMNh:`' -echo ' +MN/ -yh. `+hddhy+.' -echo ' /MM+ .sh:' -echo ' :NMo -sh/' -echo ' -NMs `/yy:' -echo ' .NMy `:sh+.' -echo ' `mMm` ./yds-' -echo ' `dMMMmyo:-.````.-:oymNy:`' -echo ' +NMMMMMMMMMMMMMMMMms:`' -echo ' -+shmNMMMNmdy+:`' -echo '' -echo '' -echo ' Now attempting installation...' -echo '' -echo '' - -# Sanity checks - -echo "Looking for a previous installation of SDKMAN..." -if [ -d "$SDKMAN_DIR" ]; then - echo "SDKMAN found." - echo "" - echo "======================================================================================================" - echo " You already have SDKMAN installed." - echo " SDKMAN was found at:" - echo "" - echo " ${SDKMAN_DIR}" - echo "" - echo " Please consider running the following if you need to upgrade." - echo "" - echo " $ sdk selfupdate force" - echo "" - echo "======================================================================================================" - echo "" - exit 0 -fi - -echo "Looking for unzip..." -if ! command -v unzip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install unzip on your system using your favourite package manager." - echo "" - echo " Restart after installing unzip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for zip..." -if ! command -v zip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install zip on your system using your favourite package manager." - echo "" - echo " Restart after installing zip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for curl..." -if ! command -v curl > /dev/null; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install curl on your system using your favourite package manager." - echo "" - echo " Restart after installing curl." - echo "======================================================================================================" - echo "" - exit 1 -fi - -if [[ "$solaris" == true ]]; then - echo "Looking for gsed..." - if [ -z $(which gsed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install gsed on your solaris system." - echo "" - echo " SDKMAN uses gsed extensively." - echo "" - echo " Restart after installing gsed." - echo "======================================================================================================" - echo "" - exit 1 - fi -else - echo "Looking for sed..." - if [ -z $(command -v sed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install sed on your system using your favourite package manager." - echo "" - echo " Restart after installing sed." - echo "======================================================================================================" - echo "" - exit 1 - fi -fi - -echo "Installing SDKMAN scripts..." - - -# Create directory structure - -echo "Create distribution directories..." -mkdir -p "$sdkman_tmp_folder" -mkdir -p "$sdkman_ext_folder" -mkdir -p "$sdkman_etc_folder" -mkdir -p "$sdkman_var_folder" -mkdir -p "$sdkman_archives_folder" -mkdir -p "$sdkman_candidates_folder" - -echo "Getting available candidates..." -SDKMAN_CANDIDATES_CSV=$(curl -s "${SDKMAN_SERVICE}/candidates/all") -echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" - -echo "Prime the config file..." -touch "$sdkman_config_file" -echo "sdkman_auto_answer=false" >> "$sdkman_config_file" -if [ -z "$ZSH_VERSION" -a -z "$BASH_VERSION" ]; then - echo "sdkman_auto_complete=false" >> "$sdkman_config_file" -else - echo "sdkman_auto_complete=true" >> "$sdkman_config_file" -fi -echo "sdkman_auto_env=false" >> "$sdkman_config_file" -echo "sdkman_auto_update=true" >> "$sdkman_config_file" -echo "sdkman_beta_channel=false" >> "$sdkman_config_file" -echo "sdkman_checksum_enable=true" >> "$sdkman_config_file" -echo "sdkman_colour_enable=true" >> "$sdkman_config_file" -echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file" -echo "sdkman_curl_max_time=10" >> "$sdkman_config_file" -echo "sdkman_debug_mode=false" >> "$sdkman_config_file" -echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file" -echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file" -echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file" - -echo "Download script archive..." -curl --location --progress-bar "${SDKMAN_SERVICE}/broker/download/sdkman/install/${SDKMAN_VERSION}/${SDKMAN_PLATFORM}" > "$sdkman_zip_file" - -ARCHIVE_OK=$(unzip -qt "$sdkman_zip_file" | grep 'No errors detected in compressed data') -if [[ -z "$ARCHIVE_OK" ]]; then - echo "Downloaded zip archive corrupt. Are you connected to the internet?" - echo "" - echo "If problems persist, please ask for help on our Slack:" - echo "* easy sign up: https://slack.sdkman.io/" - echo "* report on channel: https://sdkman.slack.com/app_redirect?channel=user-issues" - rm -rf "$SDKMAN_DIR" - exit 1 -fi - -echo "Extract script archive..." -if [[ "$cygwin" == 'true' ]]; then - echo "Cygwin detected - normalizing paths for unzip..." - sdkman_tmp_folder=$(cygpath -w "$sdkman_tmp_folder") - sdkman_zip_file=$(cygpath -w "$sdkman_zip_file") - sdkman_zip_base_folder=$(cygpath -w "$sdkman_zip_base_folder") -fi -unzip -qo "$sdkman_zip_file" -d "$sdkman_tmp_folder" - -echo "Install scripts..." -mv "${sdkman_zip_base_folder}/"* "$SDKMAN_DIR" -rm -rf "$sdkman_zip_base_folder" - -echo "Set version to $SDKMAN_VERSION ..." -echo "$SDKMAN_VERSION" > "${SDKMAN_DIR}/var/version" - - -if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" - echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" - echo "Added sdkman init snippet to $sdkman_bash_profile" - fi -else - echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" - echo "Added sdkman init snippet to $sdkman_bashrc" - fi -fi - -echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" - echo "Updated existing ${sdkman_zshrc}" -fi - - - -echo -e "\n\n\nAll done!\n\n" - -echo "You are subscribed to the STABLE channel." - -echo "" -echo "Please open a new terminal, or run the following in the existing one:" -echo "" -echo " source \"${SDKMAN_DIR}/bin/sdkman-init.sh\"" -echo "" -echo "Then issue the following command:" -echo "" -echo " sdk help" -echo "" -echo "Enjoy!!!" diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/Dockerfile new file mode 100644 index 000000000..224e50bb7 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/Dockerfile @@ -0,0 +1,52 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-jdk8 +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# Atlassian SDK Setup +################################################################## + +ENV ATLASSIAN_SDK_DIR=${EMG_LOCAL_BASE_DIR}/atlassian +ENV ATLASSIAN_SDK_BIN_DIR=${ATLASSIAN_SDK_DIR}/bin +ENV ATLASSIAN_SDK_TEMP=/tmp/atlassian-plugin-sdk.tgz + +############################### +# https://community.atlassian.com/t5/Continuous-Delivery-questions/The-repository-https-packages-atlassian-com-atlassian-sdk-deb/qaq-p/1334014 +# +# https://community.developer.atlassian.com/t/the-repository-https-packages-atlassian-com-atlassian-sdk-deb-stable-release-is-not-signed/36901 + +############################### +#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 +#Install packages +#RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contrib/a/atlassian-plugin-sdk/atlassian-plugin-sdk_8.0.16_all.deb -o /tmp/atlassian-plugin-sdk.deb && \ +# dpkg -i /tmp/atlassian-plugin-sdk.deb + +RUN mkdir -p ${ATLASSIAN_SDK_BIN_DIR} && \ + wget -O ${ATLASSIAN_SDK_TEMP} "https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz" && \ + tar -xvzf /tmp/atlassian-plugin-sdk.tgz --strip-components=1 --directory ${ATLASSIAN_SDK_DIR} + +ENV PATH=$PATH:${ATLASSIAN_SDK_BIN_DIR} + +################################################################## +# Version after install +################################################################## +RUN echo "=============================================" && \ + atlas-version && \ + echo "=============================================" + +################################################################## +# cleaninig up +################################################################## +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/Makefile diff --git a/linux/obsolete/gitlab/runner/node0.12/README.md b/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node0.12/README.md rename to linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/README.md diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/docker-compose.yml new file mode 100644 index 000000000..cc5fcd580 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/atlassian-sdk/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/debian:bookworm-atlassian-sdk" + build: + context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile index 88b4f82d2..d1bec420e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile @@ -15,14 +15,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -37,7 +79,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -75,7 +117,7 @@ ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} # zstd source tarball -ENV ZSTD_VERSION=1.5.6 +ENV ZSTD_VERSION=1.5.7 ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin ENV ZSTD_INC_DIR=${ZSTD_DIR}/include @@ -252,6 +294,17 @@ ARG OPENSSL_34_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_34_ ARG OPENSSL_34_TEMP=/tmp/openssl-${OPENSSL_34_VERSION}.tar.gz ARG OPENSSL_34_TEMP_SRC=/tmp/openssl-${OPENSSL_34_VERSION} +# OpenSSL 3.5 +ENV OPENSSL_35_VERSION=3.5.5 +ENV OPENSSL_35_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_35_VERSION} +ENV OPENSSL_35_BIN_DIR=${OPENSSL_35_DIR}/bin +ENV OPENSSL_35_INC_DIR=${OPENSSL_35_DIR}/include +ENV OPENSSL_35_LIB_DIR=${OPENSSL_35_DIR}/lib64 +ENV OPENSSL_35_SRC_DIR=/usr/local/src/openssl/${OPENSSL_35_VERSION} +ARG OPENSSL_35_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP=/tmp/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP_SRC=/tmp/openssl-${OPENSSL_35_VERSION} + # LibreSSL ENV LIBRESSL_VERSION=4.0.0 ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} @@ -286,6 +339,7 @@ RUN apt-get update && \ autoconf-archive \ gnu-standards \ cmake \ + clang \ meson \ libunwind-dev \ at \ @@ -408,17 +462,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ @@ -1080,6 +1177,37 @@ RUN tar -xzf ${OPENSSL_34_TEMP} --directory /tmp && \ make -j$(nproc) && \ make -j$(nproc) install +################################################################## +# OpenSSL 3.5 +################################################################## +RUN mkdir -p ${OPENSSL_35_DIR} ${OPENSSL_35_SRC_DIR} +ADD ${OPENSSL_35_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_35_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_35_TEMP_SRC}/* ${OPENSSL_35_SRC_DIR} && \ + ln -sf ${OPENSSL_35_SRC_DIR} ${OPENSSL_35_DIR}/src && \ + cd ${OPENSSL_35_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_35_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + ################################################################## # LibreSSL ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile index 6b194f77b..500c83d0e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile.develop index dc6121170..4eba67a76 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile index a414a3471..5708b399e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile.develop index 6241ff1cc..497cd74c0 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile index 2ebdbbd09..e7aabd6be 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile.develop index dbddfe7c4..264d459de 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile index ba1f9ae15..d32d1d5f4 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile.develop index 5c3f7585f..23b9d3baf 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile index b56870f2e..22411e6a7 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile @@ -6,20 +6,32 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java18 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile.develop index 0b1b8cafe..cb1c0544c 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,32 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java18 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile index 03a257486..fda1de6b0 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile.develop index 4ea1910c7..a404f241b 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile index 17ec84353..3015db0af 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile @@ -3,23 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile.develop index 3527cfe33..85c7d4883 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile index 36dc88d37..15bf0dd2c 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile.develop index 1908d91f1..b07d63ca2 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile index 31b8e0e4d..347907937 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile @@ -3,23 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile.develop index f2c9376cd..cdfa344b9 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile index 6aaf2b914..394071b08 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile @@ -2,22 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile.develop index 3706ffc36..d7336344e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bookworm-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile index 2ea1c07ef..7e0b7fcc1 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile @@ -2,22 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile.develop index 3d80df09c..3874011d9 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:bookworm-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile index 3c6c3a582..0b945f40a 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile.develop index 568dec8f2..6ed54f87b 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile index 3ee1f75d0..1a1d1ddd1 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile.develop index 63b1ee3fa..eeaf0256d 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/current/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php70 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php70 deleted file mode 100644 index b9eb1d091..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php70 +++ /dev/null @@ -1,45 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.0 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php71 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php71 deleted file mode 100644 index 63216d60b..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php71 +++ /dev/null @@ -1,45 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.1 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php72 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php72 deleted file mode 100644 index 7ca933690..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php72 +++ /dev/null @@ -1,45 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.2 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php73 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php73 deleted file mode 100644 index 4084b905a..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php73 +++ /dev/null @@ -1,45 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.3 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php74 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php74 deleted file mode 100644 index b25712de8..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php74 +++ /dev/null @@ -1,45 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.4 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php80 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php80 deleted file mode 100644 index 2d5525f07..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php80 +++ /dev/null @@ -1,43 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.0 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php81 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php81 deleted file mode 100644 index 3b975a382..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php81 +++ /dev/null @@ -1,43 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.2 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php82 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php82 deleted file mode 100644 index 3b975a382..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php82 +++ /dev/null @@ -1,43 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.2 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php83 b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php83 deleted file mode 100644 index 9eb9cb88d..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php83 +++ /dev/null @@ -1,43 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.3 -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}.14.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 - -################################################################## -# Node.js 22.x -################################################################## -RUN groupadd -g 1337 node && \ - useradd -u 1337 --gid node --shell /bin/bash --create-home node - -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 - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo node $(node --version) && \ - echo npm $(npm --version) && \ - echo yarn $(yarn --version) && \ - echo pnpm $(pnpm --version) && \ - echo "=============================================" - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/docker-compose.yml index ec2d9915f..cdca4f820 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/docker-compose.yml @@ -8,48 +8,3 @@ services: build: context: . dockerfile: ./Dockerfile.develop - app-nodejs-php70: - image: "hub.epicm.org/epicmorg/debian:bookworm-php7.0-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php70 - app-nodejs-php71: - image: "hub.epicm.org/epicmorg/debian:bookworm-php7.1-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php71 - app-nodejs-php72: - image: "hub.epicm.org/epicmorg/debian:bookworm-php7.2-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php72 - app-nodejs-php73: - image: "hub.epicm.org/epicmorg/debian:bookworm-php7.3-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php73 - app-nodejs-php74: - image: "hub.epicm.org/epicmorg/debian:bookworm-php7.4-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php74 - app-nodejs-php80: - image: "hub.epicm.org/epicmorg/debian:bookworm-php8.0-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php80 - app-nodejs-php81: - image: "hub.epicm.org/epicmorg/debian:bookworm-php8.1-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php81 - app-nodejs-php82: - image: "hub.epicm.org/epicmorg/debian:bookworm-php8.2-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php82 - app-nodejs-php83: - image: "hub.epicm.org/epicmorg/debian:bookworm-php8.3-nodejs" - build: - context: . - dockerfile: ./Dockerfile.php83 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18/Dockerfile index 39bb3faa0..2f0445951 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18/Dockerfile.develop index a438d3069..e8f59fd69 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18/Dockerfile.develop @@ -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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node20/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node20/Dockerfile index adb5e3f83..8794e47e6 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node20/Dockerfile.develop index bff820884..5c41f37da 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node20/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile index 3ee1f75d0..1a1d1ddd1 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile.develop index 63b1ee3fa..eeaf0256d 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/Dockerfile index 16bd82168..fe7b318c7 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/Dockerfile @@ -144,8 +144,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile index aac8f8115..838e97c4e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile @@ -267,8 +267,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile index b5bf86145..ccf5b2d23 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile @@ -371,8 +371,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile index 177058c02..fadafc17a 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile @@ -373,8 +373,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile index 8473e42f7..ce4f44ff8 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile @@ -375,8 +375,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile index 391dc6f19..60a7a52f6 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile @@ -379,8 +379,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile index a1364306f..a24534c1a 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile @@ -397,8 +397,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile index 591af6782..424b866b5 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile @@ -291,8 +291,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile index f76120e0f..f5e0f4f0f 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile @@ -273,8 +273,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile index a24d666ae..3e183dc22 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile @@ -273,8 +273,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile index de4aa8e96..c2412f1dc 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile @@ -270,8 +270,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile index 80e99f953..50a70287d 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile @@ -217,8 +217,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.6/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.6/Dockerfile index 4b31cadfd..83aee085f 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -70,7 +70,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.7/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.7/Dockerfile index 1b559d85b..53230f116 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/2.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -75,7 +75,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.0/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.0/Dockerfile index bc87fc183..7b6624299 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.0/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.1/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.1/Dockerfile index 7bbd13396..748a58ae5 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.1/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.10/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.10/Dockerfile index c33b97d6b..a25745116 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.10/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.10 ################################################################## ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.11/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.11/Dockerfile index eb4212f18..669e30dfc 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.11/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.11 ################################################################## ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile index 833af7f68..1f6a8216e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.12 ################################################################## ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile index bab932e91..9c80195b5 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.13 ################################################################## ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.2/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.2/Dockerfile index 991827513..bb0e2d8a7 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.2/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.2/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.3/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.3/Dockerfile index 2f99c7ead..cd14a4785 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.3/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -92,7 +93,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -102,7 +103,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.3/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.4/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.4/Dockerfile index 9460813c6..b9e4d9efd 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.4/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.5/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.5/Dockerfile index 25d1dee66..11f66d900 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.5/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.5/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -95,7 +96,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -105,7 +106,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.6/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.6/Dockerfile index 8455465e1..670148e9c 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -96,7 +97,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -106,7 +107,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.7/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.7/Dockerfile index 74ef7e831..7a3839474 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.8/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.8/Dockerfile index 55d802195..4db97df6f 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.8/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.9/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.9/Dockerfile index a7ba9f9ac..e26b5d51a 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.9/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} # Python 3.9 ################################################################## ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/develop/Dockerfile index b1b749396..9280335c1 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/develop/Dockerfile @@ -29,14 +29,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -51,7 +93,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -89,7 +131,7 @@ ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} # zstd source tarball -ENV ZSTD_VERSION=1.5.6 +ENV ZSTD_VERSION=1.5.7 ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin ENV ZSTD_INC_DIR=${ZSTD_DIR}/include @@ -266,6 +308,17 @@ ARG OPENSSL_34_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_34_ ARG OPENSSL_34_TEMP=/tmp/openssl-${OPENSSL_34_VERSION}.tar.gz ARG OPENSSL_34_TEMP_SRC=/tmp/openssl-${OPENSSL_34_VERSION} +# OpenSSL 3.5 +ENV OPENSSL_35_VERSION=3.5.5 +ENV OPENSSL_35_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_35_VERSION} +ENV OPENSSL_35_BIN_DIR=${OPENSSL_35_DIR}/bin +ENV OPENSSL_35_INC_DIR=${OPENSSL_35_DIR}/include +ENV OPENSSL_35_LIB_DIR=${OPENSSL_35_DIR}/lib64 +ENV OPENSSL_35_SRC_DIR=/usr/local/src/openssl/${OPENSSL_35_VERSION} +ARG OPENSSL_35_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP=/tmp/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP_SRC=/tmp/openssl-${OPENSSL_35_VERSION} + # LibreSSL ENV LIBRESSL_VERSION=4.0.0 ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} @@ -300,6 +353,7 @@ RUN apt-get update && \ autoconf-archive \ gnu-standards \ cmake \ + clang \ meson \ libunwind-dev \ at \ @@ -429,17 +483,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ @@ -1100,6 +1197,37 @@ RUN tar -xzf ${OPENSSL_34_TEMP} --directory /tmp && \ make -j$(nproc) && \ make -j$(nproc) install +################################################################## +# OpenSSL 3.5 +################################################################## +RUN mkdir -p ${OPENSSL_35_DIR} ${OPENSSL_35_SRC_DIR} +ADD ${OPENSSL_35_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_35_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_35_TEMP_SRC}/* ${OPENSSL_35_SRC_DIR} && \ + ln -sf ${OPENSSL_35_SRC_DIR} ${OPENSSL_35_DIR}/src && \ + cd ${OPENSSL_35_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_35_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + ################################################################## # LibreSSL ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile index e412f3fd2..2b3c1e79b 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile @@ -28,7 +28,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop index a2bd95546..51c5d4f7b 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop @@ -12,7 +12,8 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile index 84803debf..f70140ec2 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile @@ -28,7 +28,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop index ef9c12042..8a26d0cfb 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop @@ -12,7 +12,8 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile index d0150390d..c9eb48796 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile.develop index 30168e35e..2ed94189e 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile index e25ace8c0..1ef87a55a 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile.develop index dbd467cb5..4507693b4 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile index fe85e4ec4..4d8c9f0d7 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile.develop index 99659de6f..0cbeea821 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile index 81f73ab32..ede487833 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile.develop index 3946c2a69..15639511d 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile index e9187d2ea..93249b79d 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile @@ -6,20 +6,32 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java18 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile.develop index e911ffc27..893cf0142 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,32 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java18 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile index f75d037b5..6f7ca7767 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile.develop index a21184e8f..003b61bbd 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk20/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile index 2122bddcd..fdd91809a 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile @@ -3,23 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile.develop index 09d1e88d2..0cfda0c91 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile index 5ba4791c4..c6412ddb3 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile.develop index dccc578c4..9bbeb9c7e 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile index b58716d38..eea171914 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile @@ -3,23 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile.develop index 9e091cab4..5af13d215 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile index f8e7b9a45..2de34f372 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile @@ -2,22 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:trixie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile.develop index 54b776fa2..ee5596abd 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile index 0d77090d5..06cbe6193 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile @@ -2,22 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:trixie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile.develop index bb20da177..f391ea3f4 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile index 74e3e3ef5..655a5cba3 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile.develop index f5827db11..2cb3b63e1 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile index 5fb8b813c..d65cd48c6 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile.develop index 11aef7b97..bc684286a 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/current/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/Dockerfile index 7d752da65..d81bd7456 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/Dockerfile.develop index 991f9a993..041f4ff4c 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node18/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node18/Dockerfile index 064bdde51..aa0b3288f 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node18/Dockerfile.develop index 064bdde51..aa0b3288f 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node18/Dockerfile.develop @@ -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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/Dockerfile index 7d752da65..d81bd7456 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/Dockerfile.develop index 991f9a993..041f4ff4c 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile index 5fb8b813c..d65cd48c6 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile.develop index 11aef7b97..bc684286a 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/2.6/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/2.6/Dockerfile index e6a9ce041..f1e0ee5c3 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/2.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/2.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -70,7 +70,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/2.7/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/2.7/Dockerfile index 9e2e8dce5..78b451e59 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/2.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -75,7 +75,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.0/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.0/Dockerfile index e11c32a0e..e611f9aa2 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.0/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.1/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.1/Dockerfile index 0ecf4bcd3..c7413dd94 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.1/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.10/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.10/Dockerfile index 4926924ad..9a95916fd 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.10/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.10 ################################################################## ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.11/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.11/Dockerfile index 4e7072572..8732113fd 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.11/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.11 ################################################################## ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile index 26b27b875..6a0dca61e 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.12 ################################################################## ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile index 413dacd1b..36c1b7482 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.13 ################################################################## ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.2/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.2/Dockerfile index 42b43c116..ef0c6b391 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.2/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.2/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.3/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.3/Dockerfile index 8e9430ccc..9c9566b08 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.3/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -92,7 +93,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -102,7 +103,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.3/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.4/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.4/Dockerfile index 755316442..73d9eea94 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.4/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.5/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.5/Dockerfile index a15dee4bf..cbe640d7c 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.5/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.5/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -95,7 +96,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -105,7 +106,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.6/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.6/Dockerfile index fa6fa0663..134ae111c 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -96,7 +97,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -106,7 +107,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.7/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.7/Dockerfile index 0f0cb6ae1..d430d3e5e 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.8/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.8/Dockerfile index 8785b9e73..b24c0a0c1 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.8/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.9/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.9/Dockerfile index 7d5e1fbf4..a6e4fdc35 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.9/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} # Python 3.9 ################################################################## ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/develop/Dockerfile index 9616ec0a6..8e3b6371a 100644 --- a/linux/ecosystem/epicmorg/debian/sid/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/develop/Dockerfile @@ -15,14 +15,56 @@ ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-run ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz # cmake compiller -ENV CMAKE_VERSION=3.31.3 -ENV CMAKE_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_VERSION} -ARG CMAKE_BIN_DIR=${CMAKE_DIR}/bin -ARG CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -ARG CMAKE_TEMP=/tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz # flutter source tarball -ENV FLUTTER_VERSION=3.27.1 +ENV FLUTTER_VERSION=3.29.2 ENV FLUTTER_CHANNEL=stable ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin @@ -37,7 +79,7 @@ ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v$ ARG NINJA_TEMP=/tmp/ninja-linux.zip # GO source tarball -ENV GO_VERSION=1.23.4 +ENV GO_VERSION=1.24.2 ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz @@ -75,7 +117,7 @@ ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} # zstd source tarball -ENV ZSTD_VERSION=1.5.6 +ENV ZSTD_VERSION=1.5.7 ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin ENV ZSTD_INC_DIR=${ZSTD_DIR}/include @@ -252,6 +294,17 @@ ARG OPENSSL_34_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_34_ ARG OPENSSL_34_TEMP=/tmp/openssl-${OPENSSL_34_VERSION}.tar.gz ARG OPENSSL_34_TEMP_SRC=/tmp/openssl-${OPENSSL_34_VERSION} +# OpenSSL 3.5 +ENV OPENSSL_35_VERSION=3.5.5 +ENV OPENSSL_35_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_35_VERSION} +ENV OPENSSL_35_BIN_DIR=${OPENSSL_35_DIR}/bin +ENV OPENSSL_35_INC_DIR=${OPENSSL_35_DIR}/include +ENV OPENSSL_35_LIB_DIR=${OPENSSL_35_DIR}/lib64 +ENV OPENSSL_35_SRC_DIR=/usr/local/src/openssl/${OPENSSL_35_VERSION} +ARG OPENSSL_35_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP=/tmp/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP_SRC=/tmp/openssl-${OPENSSL_35_VERSION} + # LibreSSL ENV LIBRESSL_VERSION=4.0.0 ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} @@ -286,6 +339,7 @@ RUN apt-get update && \ autoconf-archive \ gnu-standards \ cmake \ + clang \ meson \ libunwind-dev \ at \ @@ -408,17 +462,60 @@ RUN echo "=============================================" && \ ################################################################## # CMake ################################################################## -RUN mkdir -p ${CMAKE_DIR} -ADD ${CMAKE_DOWNLOAD_URL} /tmp +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp -RUN tar -xf ${CMAKE_TEMP} --directory ${CMAKE_DIR} --strip-components=1 && \ - chmod +x ${CMAKE_BIN_DIR}/ccmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake && \ - chmod +x ${CMAKE_BIN_DIR}/cmake-gui && \ - chmod +x ${CMAKE_BIN_DIR}/cpack && \ - chmod +x ${CMAKE_BIN_DIR}/ctest +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest -ENV PATH="${CMAKE_BIN_DIR}:${PATH}" +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo $(cmake --version) && \ @@ -1079,6 +1176,37 @@ RUN tar -xzf ${OPENSSL_34_TEMP} --directory /tmp && \ make -j$(nproc) && \ make -j$(nproc) install +################################################################## +# OpenSSL 3.5 +################################################################## +RUN mkdir -p ${OPENSSL_35_DIR} ${OPENSSL_35_SRC_DIR} +ADD ${OPENSSL_35_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_35_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_35_TEMP_SRC}/* ${OPENSSL_35_SRC_DIR} && \ + ln -sf ${OPENSSL_35_SRC_DIR} ${OPENSSL_35_DIR}/src && \ + cd ${OPENSSL_35_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_35_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + ################################################################## # LibreSSL ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile index 9bf29e8ad..87b47edcf 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile @@ -28,7 +28,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop index a2d485d97..ecf94e394 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop @@ -12,7 +12,8 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile index 946f16777..80472c0ca 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile @@ -28,7 +28,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop index 1ed01aaef..0a974b09f 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop @@ -12,7 +12,8 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ################################################################## # installing dotnet diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile index 8ac4d6ab3..ce395a47d 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile.develop index 6becf3120..e2cc19a3c 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk11/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=11 ARG K_JDK_FULL_VERSION=jdk-11.0.26 ARG K_JDK_VERSION=11.0.26 ARG K_JDK_BUILD_VERSION=4 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java11 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile index 367e81fc4..24fd388cb 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java17 +# installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile.develop index ce66e2a7b..8621da6f7 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk16/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=16 ARG K_JDK_FULL_VERSION=jdk-16.0.2 ARG K_JDK_VERSION=16.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java16 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile index ba2735869..eb34762e9 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile.develop index 5cc8f3507..8c9d9b1b8 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk17/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile index 2d0553f6e..f085e585f 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile.develop index e9b448f6b..95c8ed1a2 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk18/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=18 ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 ARG K_JDK_VERSION=18.0.2.1 ARG K_JDK_BUILD_VERSION=1 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java18 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile index 82253c364..b123d2ed8 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile @@ -6,20 +6,32 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java18 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile.develop index f3c2e955d..0da1cf163 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk19/Dockerfile.develop @@ -6,18 +6,32 @@ ARG K_JDK_MAJOR_VERSION=19 ARG K_JDK_FULL_VERSION=jdk-19.0.2 ARG K_JDK_VERSION=19.0.2 ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java18 +# installing java19 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile index f508e4333..4abbb9ef1 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile.develop index 81dc85011..bacdf1b47 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk20/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=20 ARG K_JDK_FULL_VERSION=jdk-20.0.2 ARG K_JDK_VERSION=20.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java20 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile index f98648d00..85d890fb2 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile @@ -3,23 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile.develop index 8dc8b5450..ba5fab7ba 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk21/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.5 -ARG K_JDK_VERSION=21.0.5 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-21.0.6 +ARG K_JDK_VERSION=21.0.6 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java21 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile index 956ee93ef..af4956b3e 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile.develop index b68a80344..1a0fb77fd 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk22/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=22 ARG K_JDK_FULL_VERSION=jdk-22.0.2 ARG K_JDK_VERSION=22.0.2 ARG K_JDK_BUILD_VERSION=9 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java22 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile index 507f19b62..a5af3613a 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile @@ -3,23 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile.develop index 8987b8fee..d79568b62 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk23/Dockerfile.develop @@ -3,21 +3,34 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_JDK_MAJOR_VERSION=23 -ARG K_JDK_FULL_VERSION=jdk-23.0.1 -ARG K_JDK_VERSION=23.0.1 -ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_FULL_VERSION=jdk-23.0.2 +ARG K_JDK_VERSION=23.0.2 +ARG K_JDK_BUILD_VERSION=7 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## -# installing java21 +# installing java23 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile index dfc2d75c5..fbfaa26b3 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile @@ -2,22 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:sid LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile.develop index 732642fae..d3733c8a5 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk6/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 +ARG K_JDK_MAJOR_VERSION=6 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.22.0.3 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.119 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java6 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile index f1ecd1c43..2e28d2b60 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile @@ -2,22 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:sid LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile.develop index e60bb4887..724828b73 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk7/Dockerfile.develop @@ -2,20 +2,34 @@ FROM hub.epicm.org/epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 +ARG K_JDK_MAJOR_VERSION=7 +ARG K_JDK_VERSION=${K_JDK_MAJOR_VERSION}.56.0.11 +ARG K_JDK_BUILD_VERSION=${K_JDK_MAJOR_VERSION}.0.352 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java7 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile index bb275ab48..e1c023c5a 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile @@ -6,20 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile.develop index 46b775148..44726d9ec 100644 --- a/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/jdk/jdk8/Dockerfile.develop @@ -6,18 +6,31 @@ ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile index 2a92f69cf..504a0554c 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile.develop index cda495f70..6d44705dc 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/current/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/Dockerfile index 5a2035ae1..b6ab59bf7 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/Dockerfile.develop index f08cba3b7..478c0c98e 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile index d1742de92..9794972e2 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop index 2f9a089d0..ffa9d3c8b 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop @@ -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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/Dockerfile index 5a2035ae1..b6ab59bf7 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/Dockerfile.develop index f08cba3b7..478c0c98e 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/Dockerfile.develop @@ -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}.18.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.19.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile index 2a92f69cf..504a0554c 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile.develop index cda495f70..6d44705dc 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node23/Dockerfile.develop @@ -4,7 +4,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=23 -ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 diff --git a/linux/ecosystem/epicmorg/debian/sid/python/2.6/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/2.6/Dockerfile index 75fe8896e..1c66acb90 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/2.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/2.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -70,7 +70,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/sid/python/2.7/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/2.7/Dockerfile index 8ef1e9857..3f78f247f 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/2.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -75,7 +75,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ################################################################## ENV PYTHON_VERSION=2.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.18 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.0/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.0/Dockerfile index 43298c3bf..da3e9cca0 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.0/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.0 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.1 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.1/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.1/Dockerfile index 3d5a28ecc..a6a822507 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.1/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -90,7 +91,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.1 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.5 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -100,7 +101,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" #ADD https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz /tmp diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.10/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.10/Dockerfile index 26919fdc1..2f15b9b26 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.10/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.10 ################################################################## ENV PYTHON_VERSION=3.10 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.16 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.11/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.11/Dockerfile index a61a651b5..af73ec3e4 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.11/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.11 ################################################################## ENV PYTHON_VERSION=3.11 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.11 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.12 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile index 484b4f439..a812f681f 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.12 ################################################################## ENV PYTHON_VERSION=3.12 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.9 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile index 671f7ec6d..d410ee326 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} # Python 3.13 ################################################################## ENV PYTHON_VERSION=3.13 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.2 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.3 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_34_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib64:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_34_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.2/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.2/Dockerfile index 1c6e5cae1..53ca5dbba 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.2/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.2 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.6 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.2/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.3/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.3/Dockerfile index 1d0aa04fa..e198b1e87 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.3/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -92,7 +93,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.3 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.7 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -102,7 +103,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" ADD https://bootstrap.pypa.io/pip/3.3/get-pip.py /tmp diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.4/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.4/Dockerfile index 04baa3274..2b0f22a1f 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.4/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -93,7 +94,7 @@ ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} ################################################################## ENV PYTHON_VERSION=3.4 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -103,7 +104,8 @@ COPY --from=builder ${OPENSSL_102_DIR} ${OPENSSL_102_DIR} COPY --from=builder ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_102_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_102_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.5/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.5/Dockerfile index 67014790a..5927f8a03 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.5/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.5/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -95,7 +96,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.5 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.10 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -105,7 +106,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.6/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.6/Dockerfile index 6c2752118..c5918dd9e 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.6/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -96,7 +97,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.6 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.15 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -106,7 +107,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.7/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.7/Dockerfile index d2bf03427..d76bdb530 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.7/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.7 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.17 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.8/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.8/Dockerfile index fba770036..2873d4aa5 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.8/Dockerfile @@ -25,7 +25,7 @@ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -100,7 +101,7 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ################################################################## ENV PYTHON_VERSION=3.8 ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.20 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.9/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.9/Dockerfile index bcb0bb9c0..6b75316ea 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.9/Dockerfile @@ -24,8 +24,8 @@ RUN apt update && apt install -y \ ARG LD_CONF_DIR=/etc/ld.so.conf.d/ ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src ARG PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python/${PYTHON_FULL_VERSION}/Python-${PYTHON_FULL_VERSION}.tgz @@ -37,7 +37,8 @@ ADD ${PYTHON_DOWNLOAD_URL} /tmp RUN tar -xvzf ${PYTHON_TEMP} --strip-components=1 --directory ${PYTHON_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${PYTHON_BIN_DIR}:${PATH}" @@ -99,8 +100,8 @@ ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} # Python 3.9 ################################################################## ENV PYTHON_VERSION=3.9 -ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.21 -ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_FULL_VERSION} +ENV PYTHON_FULL_VERSION=${PYTHON_VERSION}.22 +ENV PYTHON_DIR=${EMG_LOCAL_BASE_DIR}/python/${PYTHON_VERSION} ARG PYTHON_BIN_DIR=${PYTHON_DIR}/bin ARG PYTHON_SRC_DIR=${PYTHON_DIR}/src @@ -110,7 +111,8 @@ COPY --from=builder ${OPENSSL_111_DIR} ${OPENSSL_111_DIR} COPY --from=builder ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_SRC_DIR} ENV OPENSSL_ROOT=${OPENSSL_111_DIR} -ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH="${OPENSSL_ROOT}/lib:${PYTHON_DIR}/lib:$LD_LIBRARY_PATH" +ENV PYTHONPATH="${PYTHON_DIR}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH" ENV PATH="${OPENSSL_111_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}" RUN mv ${PYTHON_SRC_DIR} /usr/local/src/${PYTHON_FULL_VERSION} && \ diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile new file mode 100644 index 000000000..d6d7b38da --- /dev/null +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile @@ -0,0 +1,51 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# teamcity AMXXModX setup +################################################################## +# +# Reserved for future +# export AMXX_CSTRIKE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-cstrike-linux` && \ +# export AMXX_DOD_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-dod-linux` && \ +# export AMXX_ESF_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-esf-linux` && \ +# export AMXX_NS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-ns-linux` && \ +# export AMXX_TFC_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-tfc-linux` && \ +# export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \ +# +# Install packages +ENV AMXX_VERSION=1.10 +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} + +COPY inc.tar /tmp + +RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ + curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ + cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chmod -R 700 ${AMXX_INC_PATH} && \ + amxxpc --help 2>&1 | head -n 1 + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/Makefile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/Makefile rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Makefile diff --git a/linux/obsolete/teamcity/agent/node19/README.md b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/README.md similarity index 97% rename from linux/obsolete/teamcity/agent/node19/README.md rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.10/README.md index b53fe01e8..7177183de 100644 --- a/linux/obsolete/teamcity/agent/node19/README.md +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/README.md @@ -9,7 +9,7 @@ This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) mi The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). ## How to Use This Image @@ -90,4 +90,4 @@ Report issues of suggestions to the official TeamCity [issue tracker](https://yo ## Other TeamCity Images * [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/docker-compose.yml b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/docker-compose.yml new file mode 100644 index 000000000..042c7d88a --- /dev/null +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:amxx-sdk-rc" + build: + context: . diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.10/inc.tar b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/inc.tar similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.10/inc.tar rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.10/inc.tar diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile new file mode 100644 index 000000000..80c6c8658 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile @@ -0,0 +1,51 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# teamcity AMXXModX setup +################################################################## +# +# Reserved for future +# export AMXX_CSTRIKE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-cstrike-linux` && \ +# export AMXX_DOD_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-dod-linux` && \ +# export AMXX_ESF_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-esf-linux` && \ +# export AMXX_NS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-ns-linux` && \ +# export AMXX_TFC_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-tfc-linux` && \ +# export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \ +# +# Install packages +ENV AMXX_VERSION=1.9 +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} + +COPY inc.tar /tmp + +RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ + curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ + cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chmod -R 700 ${AMXX_INC_PATH} && \ + amxxpc --help 2>&1 | head -n 1 + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/obsolete/gitlab/runner/atlassian-sdk/Makefile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/atlassian-sdk/Makefile rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Makefile diff --git a/linux/obsolete/teamcity/agent/node20/README.md b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/README.md similarity index 97% rename from linux/obsolete/teamcity/agent/node20/README.md rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.9/README.md index b53fe01e8..7177183de 100644 --- a/linux/obsolete/teamcity/agent/node20/README.md +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/README.md @@ -9,7 +9,7 @@ This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) mi The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). ## How to Use This Image @@ -90,4 +90,4 @@ Report issues of suggestions to the official TeamCity [issue tracker](https://yo ## Other TeamCity Images * [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/docker-compose.yml b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/docker-compose.yml new file mode 100644 index 000000000..f1c2ed1cc --- /dev/null +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:amxx-sdk" + build: + context: . diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.9/inc.tar b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/inc.tar similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.9/inc.tar rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.9/inc.tar diff --git a/linux/advanced/vscode-server/android/Dockerfile.jdk17 b/linux/ecosystem/gitlab/runner/android-sdk/Dockerfile similarity index 74% rename from linux/advanced/vscode-server/android/Dockerfile.jdk17 rename to linux/ecosystem/gitlab/runner/android-sdk/Dockerfile index f3c3b46e8..42d8392d2 100644 --- a/linux/advanced/vscode-server/android/Dockerfile.jdk17 +++ b/linux/ecosystem/gitlab/runner/android-sdk/Dockerfile @@ -1,40 +1,36 @@ -################################################################################ -# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server -################################################################################ -FROM hub.epicm.org/epicmorg/vscode-server:latest - +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -################################################################## -# ARGuments -################################################################## -ENV BuildDocker true - -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk - -################################################################## -# installing java17 -################################################################## ARG K_JDK_MAJOR_VERSION=17 ARG K_JDK_FULL_VERSION=jdk-17.0.13 ARG K_JDK_VERSION=17.0.13 ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java17 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings @@ -104,21 +100,55 @@ ADD ${KNPL_LINK} /tmp RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} RUN chmod +x -R ${KNPL_BIN} + ################################################################## # Android SDK ################################################################## +ENV ANDROID_HOME=${EMG_LOCAL_BASE_DIR}/android/sdk +ENV ANDROID_SDK_ROOT=${ANDROID_HOME} + RUN apt-get update && \ apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ android-sdk \ + sdkmanager \ android-sdk-build-tools \ android-sdk-platform-tools-common \ android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 + adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ + mkdir -p ${ANDROID_HOME} && \ + sdkmanager --version && \ + gradle -v && \ + mvn -v -################################################################## -# Activate Android SDK -################################################################## -RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license +RUN sdkmanager --install --verbose \ + "cmake;3.22.1" \ +# + "cmdline-tools;latest" \ +# + "tools" \ +# + "platform-tools" \ +# + "platforms;android-21" \ + "platforms;android-34" \ + "platforms;android-35" \ +# + "build-tools;21.1.2" \ + "build-tools;34.0.0" \ + "build-tools;35.0.0" \ +# + "extras;android;m2repository" \ +# + "ndk;25.1.8937393" \ + "ndk;25.2.9519653" + +ENV PATH="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/tools/proguard/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH}" + +# Activate android sdk +RUN yes | sdkmanager --licenses && \ + flutter doctor && \ + yes | sdkmanager --licenses && \ + flutter doctor -v ################################################################## # Cleanup @@ -128,10 +158,10 @@ RUN echo "clean up" && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ rm -rfv /tmp/* ################################################################## -# update file db +# final config ################################################################## + RUN updatedb diff --git a/linux/obsolete/gitlab/runner/dotnet-sdk/Makefile b/linux/ecosystem/gitlab/runner/android-sdk/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/dotnet-sdk/Makefile rename to linux/ecosystem/gitlab/runner/android-sdk/Makefile diff --git a/linux/obsolete/teamcity/agent/node21/README.md b/linux/ecosystem/gitlab/runner/android-sdk/README.md similarity index 97% rename from linux/obsolete/teamcity/agent/node21/README.md rename to linux/ecosystem/gitlab/runner/android-sdk/README.md index b53fe01e8..7177183de 100644 --- a/linux/obsolete/teamcity/agent/node21/README.md +++ b/linux/ecosystem/gitlab/runner/android-sdk/README.md @@ -9,7 +9,7 @@ This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) mi The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). ## How to Use This Image @@ -90,4 +90,4 @@ Report issues of suggestions to the official TeamCity [issue tracker](https://yo ## Other TeamCity Images * [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/android-sdk/docker-compose.yml b/linux/ecosystem/gitlab/runner/android-sdk/docker-compose.yml new file mode 100644 index 000000000..d556f17c5 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/android-sdk/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:android-sdk" + build: + context: . diff --git a/linux/advanced/vscode-server/android/Dockerfile.jdk8 b/linux/ecosystem/gitlab/runner/atlassian-sdk/Dockerfile similarity index 66% rename from linux/advanced/vscode-server/android/Dockerfile.jdk8 rename to linux/ecosystem/gitlab/runner/atlassian-sdk/Dockerfile index 49ebd37f7..af0b0c4ca 100644 --- a/linux/advanced/vscode-server/android/Dockerfile.jdk8 +++ b/linux/ecosystem/gitlab/runner/atlassian-sdk/Dockerfile @@ -1,40 +1,36 @@ -################################################################################ -# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server -################################################################################ -FROM hub.epicm.org/epicmorg/vscode-server:latest - +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -################################################################## -# ARGuments -################################################################## -ENV BuildDocker true - -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk - -################################################################## -# installing java8 -################################################################## ARG K_JDK_MAJOR_VERSION=8 ARG K_JDK_FULL_VERSION=jdk8u432 ARG K_JDK_VERSION=8u432 ARG K_JDK_BUILD_VERSION=b06 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} 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 JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} +ENV JAVA_HOME=${K_JDK_DIR} ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} ENV PATH=$PATH:${JAVA_HOME}/bin ################################################################## # installing java8 ################################################################## ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ ln -sfv ${JAVA_HOME} /usr/jre && \ - java -version + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## # Additional settings @@ -105,33 +101,49 @@ RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} RUN chmod +x -R ${KNPL_BIN} ################################################################## -# Android SDK +# Atlassian SDK Setup ################################################################## -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - android-sdk \ - android-sdk-build-tools \ - android-sdk-platform-tools-common \ - android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 + +ENV ATLASSIAN_SDK_DIR=${EMG_LOCAL_BASE_DIR}/atlassian +ENV ATLASSIAN_SDK_BIN_DIR=${ATLASSIAN_SDK_DIR}/bin +ENV ATLASSIAN_SDK_TEMP=/tmp/atlassian-plugin-sdk.tgz + +############################### +# https://community.atlassian.com/t5/Continuous-Delivery-questions/The-repository-https-packages-atlassian-com-atlassian-sdk-deb/qaq-p/1334014 +# +# https://community.developer.atlassian.com/t/the-repository-https-packages-atlassian-com-atlassian-sdk-deb-stable-release-is-not-signed/36901 +############################### +#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 +#Install packages +#RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contrib/a/atlassian-plugin-sdk/atlassian-plugin-sdk_8.0.16_all.deb -o /tmp/atlassian-plugin-sdk.deb && \ +# dpkg -i /tmp/atlassian-plugin-sdk.deb + +RUN mkdir -p ${ATLASSIAN_SDK_BIN_DIR} && \ + wget -O ${ATLASSIAN_SDK_TEMP} "https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz" && \ + tar -xvzf /tmp/atlassian-plugin-sdk.tgz --strip-components=1 --directory ${ATLASSIAN_SDK_DIR} + +ENV PATH=$PATH:${ATLASSIAN_SDK_BIN_DIR} ################################################################## -# Activate Android SDK +# Version after install ################################################################## -RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license +RUN echo "=============================================" && \ + atlas-version && \ + echo "=============================================" ################################################################## -# Cleanup +# cleaninig up ################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ rm -rfv /tmp/* -################################################################## -# update file db -################################################################## RUN updatedb diff --git a/linux/obsolete/gitlab/runner/node0.12/Makefile b/linux/ecosystem/gitlab/runner/atlassian-sdk/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node0.12/Makefile rename to linux/ecosystem/gitlab/runner/atlassian-sdk/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/README.md b/linux/ecosystem/gitlab/runner/atlassian-sdk/README.md similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk17/README.md rename to linux/ecosystem/gitlab/runner/atlassian-sdk/README.md diff --git a/linux/obsolete/gitlab/runner/atlassian-sdk/docker-compose.yml b/linux/ecosystem/gitlab/runner/atlassian-sdk/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/atlassian-sdk/docker-compose.yml rename to linux/ecosystem/gitlab/runner/atlassian-sdk/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile b/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile new file mode 100644 index 000000000..ccdf34368 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile @@ -0,0 +1,25 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# Version after install +################################################################## +RUN echo "=============================================" && \ + echo $(dotnet --info) && \ + echo $(dotnet --list-sdks) && \ + echo $(dotnet --list-runtimes) && \ + echo "=============================================" + +################################################################## +# Cleanup +################################################################## +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 /root/tmp/* && \ + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/obsolete/gitlab/runner/node10/Makefile b/linux/ecosystem/gitlab/runner/dotnet-sdk/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node10/Makefile rename to linux/ecosystem/gitlab/runner/dotnet-sdk/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/README.md b/linux/ecosystem/gitlab/runner/dotnet-sdk/README.md similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/android-sdk/jdk8/README.md rename to linux/ecosystem/gitlab/runner/dotnet-sdk/README.md diff --git a/linux/ecosystem/gitlab/runner/dotnet-sdk/docker-compose.yml b/linux/ecosystem/gitlab/runner/dotnet-sdk/docker-compose.yml new file mode 100644 index 000000000..ea0d29969 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/dotnet-sdk/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:dotnet-sdk" + build: + context: . diff --git a/linux/ecosystem/gitlab/runner/latest/Dockerfile b/linux/ecosystem/gitlab/runner/latest/Dockerfile index 7299353c0..b7e650d23 100644 --- a/linux/ecosystem/gitlab/runner/latest/Dockerfile +++ b/linux/ecosystem/gitlab/runner/latest/Dockerfile @@ -2,17 +2,10 @@ FROM hub.epicm.org/epicmorg/debian:bookworm-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - ################################################################## -# docker and buildah setup +# OCI setup: Buildah, Podman, Kaniko, Docker ################################################################## - -#Install packages +# https://docs.docker.com/build/architecture/#install-buildx 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 && \ @@ -24,61 +17,107 @@ RUN install -m 0755 -d /etc/apt/keyrings && \ containerd.io \ docker-buildx-plugin \ docker-compose-plugin \ - buildah \ - fuse-overlayfs \ - systemd && \ + containerd.io \ + buildah \ + podman \ + podman-compose \ + fuse-overlayfs && \ + pip3 install --break-system-packages --no-cache-dir \ + kaniko-wrapper \ + buildah-wrapper && \ systemctl disable docker && \ - docker --version && \ - buildah --version - -COPY run-docker.sh /services/run-docker.sh -COPY etc/containers/registries.conf /etc/containers/registries.conf -COPY etc/containers/storage.conf /etc/containers/storage.conf - -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ + systemctl disable podman && \ + rm -rf /bin/docker-compose && \ + rm -rf /sbin/docker-compose && \ + rm -rf /usr/bin/docker-compose && \ + rm -rf /usr/sbin/docker-compose && \ + rm -rf /usr/local/bin/docker-compose && \ + rm -rf /usr/local/sbin/docker-compose && \ + export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* ################################################################## -# gitlab runner setup +# OCI post-setup ################################################################## -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 +ENV BUILDAH_FORMAT=docker +ENV BUILDAH_ISOLATION=docker +ENV DOCKER_HOST="unix:///var/run/docker.sock" +ENV PODMAN_HOST="unix:///var/run/docker.sock" + +COPY etc/ /etc/ + +################################################################## +# installing dotnet +################################################################## +ENV DOTNET_CHANNEL=STS +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 + +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 +################################################################## +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ +# echo "deb https://download.mono-project.com/repo/debian stable-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ +# echo "deb https://download.mono-project.com/repo/debian nightly-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ + echo "deb https://download.mono-project.com/repo/debian preview-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated \ + mono-complete \ + mono-llvm-support \ + mono-devel \ + mono-dbg \ + referenceassemblies-pcl \ + ca-certificates-mono \ + mono-xsp4 ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ rm -rfv /tmp/* -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker", "/var/lib/containers"] -WORKDIR /home/gitlab-runner +################################################################## +# final config +################################################################## -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh +VOLUME ["/var/lib/docker", "/var/lib/containers", "/var/tmp"] RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] diff --git a/linux/ecosystem/gitlab/runner/latest/Makefile b/linux/ecosystem/gitlab/runner/latest/Makefile index ad01d4cbf..1e4371492 100644 --- a/linux/ecosystem/gitlab/runner/latest/Makefile +++ b/linux/ecosystem/gitlab/runner/latest/Makefile @@ -1,19 +1,22 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - all: app app: + make pip make build make deploy -# make clean - + make clean build: - buildah-wrapper --build + make build-buildah deploy: - buildah-wrapper --deploy + make deploy-buildah +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy build-kaniko: kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run @@ -24,13 +27,18 @@ deploy-kaniko: build-compose: docker-compose build --compress --parallel --progress plain - 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 +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/latest/README.md b/linux/ecosystem/gitlab/runner/latest/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/ecosystem/gitlab/runner/latest/docker-entrypoint.sh b/linux/ecosystem/gitlab/runner/latest/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/ecosystem/gitlab/runner/latest/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/ecosystem/gitlab/runner/latest/containers/registries.conf b/linux/ecosystem/gitlab/runner/latest/etc/containers/registries.conf similarity index 100% rename from linux/ecosystem/gitlab/runner/latest/containers/registries.conf rename to linux/ecosystem/gitlab/runner/latest/etc/containers/registries.conf diff --git a/linux/ecosystem/gitlab/runner/latest/containers/storage.conf b/linux/ecosystem/gitlab/runner/latest/etc/containers/storage.conf similarity index 100% rename from linux/ecosystem/gitlab/runner/latest/containers/storage.conf rename to linux/ecosystem/gitlab/runner/latest/etc/containers/storage.conf diff --git a/linux/ecosystem/gitlab/runner/latest/etc/supervisor/conf.d/docker-service.conf b/linux/ecosystem/gitlab/runner/latest/etc/supervisor/conf.d/docker-service.conf new file mode 100644 index 000000000..faaafcaf4 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/latest/etc/supervisor/conf.d/docker-service.conf @@ -0,0 +1,13 @@ +[program:dockerd] +command=/usr/bin/dockerd --host unix:///var/run/docker.sock --experimental --iptables=false --bridge=none --log-level=warn +autostart=true +autorestart=true +killasgroup=true +stopasgroup=true +stdout_logfile=/var/log/supervisor/dockerd.out.log +stdout_logfile_maxbytes=128MB +stderr_logfile=/var/log/supervisor/dockerd.err.log +stderr_logfile_maxbytes=128MB +user=root +priority=1 +startretries=5 diff --git a/linux/ecosystem/gitlab/runner/latest/run-docker.sh b/linux/ecosystem/gitlab/runner/latest/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/ecosystem/gitlab/runner/latest/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/ecosystem/gitlab/runner/minimal/Dockerfile b/linux/ecosystem/gitlab/runner/minimal/Dockerfile new file mode 100644 index 000000000..e9ee66cb3 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/minimal/Dockerfile @@ -0,0 +1,53 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# gitlab runner setup +################################################################## +ENV GITLAB_RUNNER_DIR=${EMG_LOCAL_BASE_DIR}/gitlab/runner +ENV GITLAB_RUNNER_BIN_DIR=${GITLAB_RUNNER_DIR}/bin +ENV GITLAB_RUNNER_CONF_DIR=${GITLAB_RUNNER_DIR}/etc/gitlab-runner +ENV GITLAB_RUNNER_CERTS_DIR=${GITLAB_RUNNER_CONF_DIR}/certs +ENV GITLAB_RUNNER_WORKER_DIR=${GITLAB_RUNNER_DIR}/worker + +ENV GIT_SSH_VARIANT=ssh + +ADD https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-linux-amd64 /tmp + +RUN mkdir -p \ + ${GITLAB_RUNNER_DIR} \ + ${GITLAB_RUNNER_BIN_DIR} \ + ${GITLAB_RUNNER_CONF_DIR} \ + ${GITLAB_RUNNER_CERTS_DIR} \ + ${GITLAB_RUNNER_WORKER_DIR} && \ + ln -sfv ${GITLAB_RUNNER_CONF_DIR} /etc/gitlab-runner && \ + mv /tmp/gitlab-runner-linux-amd64 ${GITLAB_RUNNER_BIN_DIR}/gitlab-runner && \ + chmod -R 700 ${GITLAB_RUNNER_CONF_DIR} && \ + chmod +x ${GITLAB_RUNNER_BIN_DIR}/gitlab-runner + +ENV PATH=${GITLAB_RUNNER_BIN_DIR}:$PATH + +RUN gitlab-runner --version + +################################################################## +# cleaninig up +################################################################## +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +################################################################## +# final config +################################################################## +WORKDIR ${GITLAB_RUNNER_DIR} + +VOLUME ["${GITLAB_RUNNER_CONF_DIR}", "${GITLAB_RUNNER_CERTS_DIR}", "${GITLAB_RUNNER_WORKER_DIR}", "/var/log/supervisor"] + +CMD ["/usr/bin/supervisord"] + +RUN updatedb diff --git a/linux/obsolete/gitlab/runner/node11/Makefile b/linux/ecosystem/gitlab/runner/minimal/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node11/Makefile rename to linux/ecosystem/gitlab/runner/minimal/Makefile diff --git a/linux/ecosystem/gitlab/runner/minimal/docker-compose.yml b/linux/ecosystem/gitlab/runner/minimal/docker-compose.yml new file mode 100644 index 000000000..d40e060dc --- /dev/null +++ b/linux/ecosystem/gitlab/runner/minimal/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:minimal" + build: + context: . diff --git a/linux/ecosystem/gitlab/runner/minimal/etc/supervisor/conf.d/gitlab-runner.conf b/linux/ecosystem/gitlab/runner/minimal/etc/supervisor/conf.d/gitlab-runner.conf new file mode 100644 index 000000000..5d9b11bec --- /dev/null +++ b/linux/ecosystem/gitlab/runner/minimal/etc/supervisor/conf.d/gitlab-runner.conf @@ -0,0 +1,15 @@ +[program:gitlab-runner] +command=/usr/local/share/epicmorg/gitlab/runner/bin/gitlab-runner run --working-directory /usr/local/share/epicmorg/gitlab/runner/worker --config /usr/local/share/epicmorg/gitlab/runner/etc/gitlab-runner/config.toml --service gitlab-runner +autostart=true +autorestart=true +killasgroup=true +stopasgroup=true +#stdout_logfile=/var/log/supervisor/gitlab-runner.out.log +#stderr_logfile=/var/log/supervisor/gitlab-runner.err.log +stdout_logfile=/dev/fd/1 +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/fd/2 +stderr_logfile_maxbytes=0 +user=root +priority=10 +startretries=5 diff --git a/linux/ecosystem/gitlab/runner/minimal/etc/supervisor/conf.d/supervisord.conf b/linux/ecosystem/gitlab/runner/minimal/etc/supervisor/conf.d/supervisord.conf new file mode 100644 index 000000000..591277381 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/minimal/etc/supervisor/conf.d/supervisord.conf @@ -0,0 +1,5 @@ +[supervisord] +nodaemon=true + +#[inet_http_server] +#port = 1337 diff --git a/linux/obsolete/gitlab/runner/node0.12/Dockerfile b/linux/ecosystem/gitlab/runner/node0.12/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node0.12/Dockerfile rename to linux/ecosystem/gitlab/runner/node0.12/Dockerfile index 6a363ee66..b5366d61f 100644 --- a/linux/obsolete/gitlab/runner/node0.12/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node0.12/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node12/Makefile b/linux/ecosystem/gitlab/runner/node0.12/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node12/Makefile rename to linux/ecosystem/gitlab/runner/node0.12/Makefile diff --git a/linux/obsolete/teamcity/agent/node22/README.md b/linux/ecosystem/gitlab/runner/node0.12/README.md similarity index 97% rename from linux/obsolete/teamcity/agent/node22/README.md rename to linux/ecosystem/gitlab/runner/node0.12/README.md index b53fe01e8..7177183de 100644 --- a/linux/obsolete/teamcity/agent/node22/README.md +++ b/linux/ecosystem/gitlab/runner/node0.12/README.md @@ -9,7 +9,7 @@ This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) mi The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). ## How to Use This Image @@ -90,4 +90,4 @@ Report issues of suggestions to the official TeamCity [issue tracker](https://yo ## Other TeamCity Images * [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node0.12/docker-compose.yml b/linux/ecosystem/gitlab/runner/node0.12/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node0.12/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node0.12/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node10/Dockerfile b/linux/ecosystem/gitlab/runner/node10/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node10/Dockerfile rename to linux/ecosystem/gitlab/runner/node10/Dockerfile index 5b6b3b642..02840f18c 100644 --- a/linux/obsolete/gitlab/runner/node10/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node10/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node13/Makefile b/linux/ecosystem/gitlab/runner/node10/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node13/Makefile rename to linux/ecosystem/gitlab/runner/node10/Makefile diff --git a/linux/ecosystem/gitlab/runner/node10/README.md b/linux/ecosystem/gitlab/runner/node10/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node10/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node10/docker-compose.yml b/linux/ecosystem/gitlab/runner/node10/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node10/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node10/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node11/Dockerfile b/linux/ecosystem/gitlab/runner/node11/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node11/Dockerfile rename to linux/ecosystem/gitlab/runner/node11/Dockerfile index c0d320918..0b7571aa3 100644 --- a/linux/obsolete/gitlab/runner/node11/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node11/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node14/Makefile b/linux/ecosystem/gitlab/runner/node11/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node14/Makefile rename to linux/ecosystem/gitlab/runner/node11/Makefile diff --git a/linux/ecosystem/gitlab/runner/node11/README.md b/linux/ecosystem/gitlab/runner/node11/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node11/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node11/docker-compose.yml b/linux/ecosystem/gitlab/runner/node11/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node11/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node11/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node12/Dockerfile b/linux/ecosystem/gitlab/runner/node12/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node12/Dockerfile rename to linux/ecosystem/gitlab/runner/node12/Dockerfile index 2c43b3d5f..4902368b4 100644 --- a/linux/obsolete/gitlab/runner/node12/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node12/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node15/Makefile b/linux/ecosystem/gitlab/runner/node12/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node15/Makefile rename to linux/ecosystem/gitlab/runner/node12/Makefile diff --git a/linux/ecosystem/gitlab/runner/node12/README.md b/linux/ecosystem/gitlab/runner/node12/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node12/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node12/docker-compose.yml b/linux/ecosystem/gitlab/runner/node12/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node12/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node12/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node13/Dockerfile b/linux/ecosystem/gitlab/runner/node13/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node13/Dockerfile rename to linux/ecosystem/gitlab/runner/node13/Dockerfile index 5c334d7cb..dc2c20c73 100644 --- a/linux/obsolete/gitlab/runner/node13/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node13/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node16/Makefile b/linux/ecosystem/gitlab/runner/node13/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node16/Makefile rename to linux/ecosystem/gitlab/runner/node13/Makefile diff --git a/linux/ecosystem/gitlab/runner/node13/README.md b/linux/ecosystem/gitlab/runner/node13/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node13/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node13/docker-compose.yml b/linux/ecosystem/gitlab/runner/node13/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node13/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node13/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node14/Dockerfile b/linux/ecosystem/gitlab/runner/node14/Dockerfile similarity index 97% rename from linux/obsolete/teamcity/agent/node14/Dockerfile rename to linux/ecosystem/gitlab/runner/node14/Dockerfile index 058f5ac81..98ec32502 100644 --- a/linux/obsolete/teamcity/agent/node14/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node14/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node17/Makefile b/linux/ecosystem/gitlab/runner/node14/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node17/Makefile rename to linux/ecosystem/gitlab/runner/node14/Makefile diff --git a/linux/ecosystem/gitlab/runner/node14/README.md b/linux/ecosystem/gitlab/runner/node14/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node14/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node14/docker-compose.yml b/linux/ecosystem/gitlab/runner/node14/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node14/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node14/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node15/Dockerfile b/linux/ecosystem/gitlab/runner/node15/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node15/Dockerfile rename to linux/ecosystem/gitlab/runner/node15/Dockerfile index 0bd937ddf..40a778b4d 100644 --- a/linux/obsolete/gitlab/runner/node15/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node15/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node18/Makefile b/linux/ecosystem/gitlab/runner/node15/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node18/Makefile rename to linux/ecosystem/gitlab/runner/node15/Makefile diff --git a/linux/ecosystem/gitlab/runner/node15/README.md b/linux/ecosystem/gitlab/runner/node15/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node15/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node15/docker-compose.yml b/linux/ecosystem/gitlab/runner/node15/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node15/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node15/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node16/Dockerfile b/linux/ecosystem/gitlab/runner/node16/Dockerfile similarity index 97% rename from linux/obsolete/teamcity/agent/node16/Dockerfile rename to linux/ecosystem/gitlab/runner/node16/Dockerfile index 9bd9d5225..53865dbb7 100644 --- a/linux/obsolete/teamcity/agent/node16/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node16/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node19/Makefile b/linux/ecosystem/gitlab/runner/node16/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node19/Makefile rename to linux/ecosystem/gitlab/runner/node16/Makefile diff --git a/linux/ecosystem/gitlab/runner/node16/README.md b/linux/ecosystem/gitlab/runner/node16/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node16/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node16/docker-compose.yml b/linux/ecosystem/gitlab/runner/node16/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node16/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node16/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node17/Dockerfile b/linux/ecosystem/gitlab/runner/node17/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node17/Dockerfile rename to linux/ecosystem/gitlab/runner/node17/Dockerfile index d14eaf823..953a4c9e9 100644 --- a/linux/obsolete/gitlab/runner/node17/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node17/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node20/Makefile b/linux/ecosystem/gitlab/runner/node17/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node20/Makefile rename to linux/ecosystem/gitlab/runner/node17/Makefile diff --git a/linux/ecosystem/gitlab/runner/node17/README.md b/linux/ecosystem/gitlab/runner/node17/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node17/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node17/docker-compose.yml b/linux/ecosystem/gitlab/runner/node17/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node17/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node17/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node18/Dockerfile b/linux/ecosystem/gitlab/runner/node18/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node18/Dockerfile rename to linux/ecosystem/gitlab/runner/node18/Dockerfile index a822c330a..df34c8dc3 100644 --- a/linux/obsolete/gitlab/runner/node18/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node18/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node21/Makefile b/linux/ecosystem/gitlab/runner/node18/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node21/Makefile rename to linux/ecosystem/gitlab/runner/node18/Makefile diff --git a/linux/ecosystem/gitlab/runner/node18/README.md b/linux/ecosystem/gitlab/runner/node18/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node18/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node18/docker-compose.yml b/linux/ecosystem/gitlab/runner/node18/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node18/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node18/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node19/Dockerfile b/linux/ecosystem/gitlab/runner/node19/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node19/Dockerfile rename to linux/ecosystem/gitlab/runner/node19/Dockerfile index 4809d7626..58f1a312f 100644 --- a/linux/obsolete/gitlab/runner/node19/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node19/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node22/Makefile b/linux/ecosystem/gitlab/runner/node19/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node22/Makefile rename to linux/ecosystem/gitlab/runner/node19/Makefile diff --git a/linux/ecosystem/gitlab/runner/node19/README.md b/linux/ecosystem/gitlab/runner/node19/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node19/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node19/docker-compose.yml b/linux/ecosystem/gitlab/runner/node19/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node19/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node19/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node20/Dockerfile b/linux/ecosystem/gitlab/runner/node20/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node20/Dockerfile rename to linux/ecosystem/gitlab/runner/node20/Dockerfile index 5cd0ec1a6..3820fe4db 100644 --- a/linux/obsolete/gitlab/runner/node20/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node20/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node4/Makefile b/linux/ecosystem/gitlab/runner/node20/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node4/Makefile rename to linux/ecosystem/gitlab/runner/node20/Makefile diff --git a/linux/ecosystem/gitlab/runner/node20/README.md b/linux/ecosystem/gitlab/runner/node20/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node20/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node20/docker-compose.yml b/linux/ecosystem/gitlab/runner/node20/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node20/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node20/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node21/Dockerfile b/linux/ecosystem/gitlab/runner/node21/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node21/Dockerfile rename to linux/ecosystem/gitlab/runner/node21/Dockerfile index cc607156f..b3830e312 100644 --- a/linux/obsolete/gitlab/runner/node21/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node21/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node5/Makefile b/linux/ecosystem/gitlab/runner/node21/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node5/Makefile rename to linux/ecosystem/gitlab/runner/node21/Makefile diff --git a/linux/ecosystem/gitlab/runner/node21/README.md b/linux/ecosystem/gitlab/runner/node21/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node21/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node21/docker-compose.yml b/linux/ecosystem/gitlab/runner/node21/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node21/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node21/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node22/Dockerfile b/linux/ecosystem/gitlab/runner/node22/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node22/Dockerfile rename to linux/ecosystem/gitlab/runner/node22/Dockerfile index 4b226f140..7754197a0 100644 --- a/linux/obsolete/gitlab/runner/node22/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node22/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node6/Makefile b/linux/ecosystem/gitlab/runner/node22/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node6/Makefile rename to linux/ecosystem/gitlab/runner/node22/Makefile diff --git a/linux/ecosystem/gitlab/runner/node22/README.md b/linux/ecosystem/gitlab/runner/node22/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node22/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node22/docker-compose.yml b/linux/ecosystem/gitlab/runner/node22/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node22/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node22/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/node23/Dockerfile b/linux/ecosystem/gitlab/runner/node23/Dockerfile new file mode 100644 index 000000000..0cc9eae2b --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node23/Dockerfile @@ -0,0 +1,49 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ARG K_NODE_MAJOR_VERSION=23 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 + +################################################################## +# Node.js 23.x +################################################################## +RUN groupadd -g 1337 node && \ + useradd -u 1337 --gid node --shell /bin/bash --create-home node + +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 + +################################################################## +# Version after install +################################################################## +RUN echo "=============================================" && \ + echo node $(node --version) && \ + echo npm $(npm --version) && \ + echo yarn $(yarn --version) && \ + echo pnpm $(pnpm --version) && \ + echo "=============================================" + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## + +RUN updatedb diff --git a/linux/obsolete/gitlab/runner/node7/Makefile b/linux/ecosystem/gitlab/runner/node23/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node7/Makefile rename to linux/ecosystem/gitlab/runner/node23/Makefile diff --git a/linux/ecosystem/gitlab/runner/node23/README.md b/linux/ecosystem/gitlab/runner/node23/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node23/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/node23/docker-compose.yml b/linux/ecosystem/gitlab/runner/node23/docker-compose.yml new file mode 100644 index 000000000..245a67974 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node23/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:node23" + build: + context: . diff --git a/linux/obsolete/gitlab/runner/node4/Dockerfile b/linux/ecosystem/gitlab/runner/node4/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node4/Dockerfile rename to linux/ecosystem/gitlab/runner/node4/Dockerfile index 455a6d865..73a9d68e4 100644 --- a/linux/obsolete/gitlab/runner/node4/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node4/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node8/Makefile b/linux/ecosystem/gitlab/runner/node4/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node8/Makefile rename to linux/ecosystem/gitlab/runner/node4/Makefile diff --git a/linux/ecosystem/gitlab/runner/node4/README.md b/linux/ecosystem/gitlab/runner/node4/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node4/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node4/docker-compose.yml b/linux/ecosystem/gitlab/runner/node4/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node4/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node4/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node5/Dockerfile b/linux/ecosystem/gitlab/runner/node5/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node5/Dockerfile rename to linux/ecosystem/gitlab/runner/node5/Dockerfile index 0aae1ac62..e2d62c33e 100644 --- a/linux/obsolete/gitlab/runner/node5/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node5/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/node9/Makefile b/linux/ecosystem/gitlab/runner/node5/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/node9/Makefile rename to linux/ecosystem/gitlab/runner/node5/Makefile diff --git a/linux/ecosystem/gitlab/runner/node5/README.md b/linux/ecosystem/gitlab/runner/node5/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node5/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node5/docker-compose.yml b/linux/ecosystem/gitlab/runner/node5/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node5/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node5/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node6/Dockerfile b/linux/ecosystem/gitlab/runner/node6/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node6/Dockerfile rename to linux/ecosystem/gitlab/runner/node6/Dockerfile index ec918f7f7..a613c8561 100644 --- a/linux/obsolete/gitlab/runner/node6/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node6/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG K_NODE_MAJOR_VERSION=6 diff --git a/linux/obsolete/gitlab/runner/php7.2/Makefile b/linux/ecosystem/gitlab/runner/node6/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/php7.2/Makefile rename to linux/ecosystem/gitlab/runner/node6/Makefile diff --git a/linux/ecosystem/gitlab/runner/node6/README.md b/linux/ecosystem/gitlab/runner/node6/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node6/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node6/docker-compose.yml b/linux/ecosystem/gitlab/runner/node6/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node6/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node6/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node7/Dockerfile b/linux/ecosystem/gitlab/runner/node7/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node7/Dockerfile rename to linux/ecosystem/gitlab/runner/node7/Dockerfile index 81603d7dc..e3def3513 100644 --- a/linux/obsolete/gitlab/runner/node7/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node7/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/php7.3/Makefile b/linux/ecosystem/gitlab/runner/node7/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/php7.3/Makefile rename to linux/ecosystem/gitlab/runner/node7/Makefile diff --git a/linux/ecosystem/gitlab/runner/node7/README.md b/linux/ecosystem/gitlab/runner/node7/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node7/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node7/docker-compose.yml b/linux/ecosystem/gitlab/runner/node7/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node7/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node7/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node8/Dockerfile b/linux/ecosystem/gitlab/runner/node8/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node8/Dockerfile rename to linux/ecosystem/gitlab/runner/node8/Dockerfile index 9c85e6197..d68da9760 100644 --- a/linux/obsolete/gitlab/runner/node8/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node8/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/php7.4/Makefile b/linux/ecosystem/gitlab/runner/node8/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/php7.4/Makefile rename to linux/ecosystem/gitlab/runner/node8/Makefile diff --git a/linux/ecosystem/gitlab/runner/node8/README.md b/linux/ecosystem/gitlab/runner/node8/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node8/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node8/docker-compose.yml b/linux/ecosystem/gitlab/runner/node8/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node8/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node8/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node9/Dockerfile b/linux/ecosystem/gitlab/runner/node9/Dockerfile similarity index 97% rename from linux/obsolete/gitlab/runner/node9/Dockerfile rename to linux/ecosystem/gitlab/runner/node9/Dockerfile index 1a637298c..e2e0058be 100644 --- a/linux/obsolete/gitlab/runner/node9/Dockerfile +++ b/linux/ecosystem/gitlab/runner/node9/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/obsolete/gitlab/runner/php8.0/Makefile b/linux/ecosystem/gitlab/runner/node9/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/php8.0/Makefile rename to linux/ecosystem/gitlab/runner/node9/Makefile diff --git a/linux/ecosystem/gitlab/runner/node9/README.md b/linux/ecosystem/gitlab/runner/node9/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/node9/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/obsolete/gitlab/runner/node9/docker-compose.yml b/linux/ecosystem/gitlab/runner/node9/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/node9/docker-compose.yml rename to linux/ecosystem/gitlab/runner/node9/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php56/Dockerfile b/linux/ecosystem/gitlab/runner/php56/Dockerfile new file mode 100644 index 000000000..b37066113 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php56/Dockerfile @@ -0,0 +1,280 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=5.6 +ENV PHP_MODULE_PATH=/usr/lib/php/20131226 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP5.6 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ +# php-pear \ + php5.6 \ + php5.6-cli \ + php5.6-common \ + php5.6-dev \ + php5.6-amqp \ + php5.6-apcu \ + php5.6-bcmath \ + php5.6-bz2 \ + php5.6-cgi \ + php5.6-curl \ + php5.6-dba \ + php5.6-dio \ + php5.6-enchant \ + php5.6-fpm \ + php5.6-gd \ + php5.6-gearman \ + php5.6-geoip \ +# php5.6-gmagick \ + php5.6-gmp \ + php5.6-gnupg \ + php5.6-grpc \ + php5.6-http \ + php5.6-igbinary \ + php5.6-imagick \ + php5.6-imap \ + php5.6-inotify \ + php5.6-interbase \ + php5.6-intl \ + php5.6-json \ + php5.6-ldap \ + php5.6-libvirt-php \ + php5.6-lua \ + php5.6-lz4 \ + php5.6-mailparse \ + php5.6-mbstring \ + php5.6-mcrypt \ + php5.6-memcache \ + php5.6-memcached \ + php5.6-mongo \ + php5.6-mongodb \ + php5.6-msgpack \ + php5.6-mysql \ + php5.6-mysqlnd-ms \ + php5.6-oauth \ + php5.6-odbc \ + php5.6-opcache \ + php5.6-pgsql \ + php5.6-phpdbg \ + php5.6-propro \ + php5.6-protobuf \ + php5.6-ps \ + php5.6-pspell \ + php5.6-radius \ + php5.6-raphf \ + php5.6-readline \ + php5.6-recode \ + php5.6-redis \ + php5.6-rrd \ + php5.6-smbclient \ + php5.6-snmp \ + php5.6-soap \ + php5.6-solr \ + php5.6-sqlite3 \ + php5.6-ssh2 \ + php5.6-stomp \ + php5.6-sybase \ + php5.6-tidy \ + php5.6-uploadprogress \ +# php5.6-xcache \ + php5.6-xdebug \ + php5.6-xhprof \ + php5.6-xml \ + php5.6-xmlrpc \ + php5.6-xsl \ +# php5.6-yac \ + php5.6-yaml \ + php5.6-zip \ + php5.6-zmq \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ +# php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php5.6 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +################################################################## +# Enabling extensions +################################################################## +#RUN pear update-channels && \ +# pecl channel-update pecl.php.net && \ +# pear upgrade + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +#OPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +#RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +#RUN cd /tmp/cassandra-php-driver && \ +# dpkg -i ./multiarch-support_2.28_amd64.deb && \ +# dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ +# dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ +# dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +# echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > /usr/local/etc/php/conf.d/cassandra.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing imagic addon +################################################################## +#RUN pecl install imagick && \ +## echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/apache2/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_5.6.so ${PHP_MODULE_PATH} && \ + # echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.6.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.6.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.6.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +#COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +#RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +## ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node7/Makefile b/linux/ecosystem/gitlab/runner/php56/Makefile similarity index 94% rename from linux/obsolete/teamcity/agent/node7/Makefile rename to linux/ecosystem/gitlab/runner/php56/Makefile index 1e4371492..b88fa3708 100644 --- a/linux/obsolete/teamcity/agent/node7/Makefile +++ b/linux/ecosystem/gitlab/runner/php56/Makefile @@ -7,10 +7,10 @@ app: make clean build: - make build-buildah + kaniko-wrapper --version deploy: - make deploy-buildah + make deploy-kaniko build-buildah: buildah-wrapper --build diff --git a/linux/ecosystem/gitlab/runner/php56/README.md b/linux/ecosystem/gitlab/runner/php56/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php56/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php56/docker-compose.yml b/linux/ecosystem/gitlab/runner/php56/docker-compose.yml new file mode 100644 index 000000000..98e443ed6 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php56/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:php5.6" + build: + context: . diff --git a/linux/ecosystem/gitlab/runner/php70/Dockerfile b/linux/ecosystem/gitlab/runner/php70/Dockerfile new file mode 100644 index 000000000..9b86dd538 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php70/Dockerfile @@ -0,0 +1,384 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.0 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20151012 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +#installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.0 \ + php7.0-common \ + php7.0-dev \ + php7.0-fpm \ + php7.0-cli \ + php7.0-xml \ + php7.0-cgi && \ + update-alternatives --set php /usr/bin/php7.0 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=7.0 +ENV PHP_MODULE_PATH=/usr/lib/php/20151012 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +#installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.0 \ + php7.0-cli \ + php7.0-common \ + php7.0-dev \ + php7.0-amqp \ + php7.0-apcu-bc \ + php7.0-apcu \ + php7.0-bcmath \ + php7.0-bz2 \ + php7.0-cgi \ + php7.0-curl \ + php7.0-dba \ + php7.0-decimal \ + php7.0-dio \ + php7.0-ds \ + php7.0-enchant \ + php7.0-fpm \ + php7.0-gd \ + php7.0-gearman \ + php7.0-geoip \ +# php7.0-gmagick \ + php7.0-gmp \ + php7.0-gnupg \ + php7.0-grpc \ + php7.0-http \ + php7.0-igbinary \ + php7.0-imagick \ + php7.0-imap \ + php7.0-inotify \ + php7.0-interbase \ + php7.0-intl \ + php7.0-json \ + php7.0-ldap \ + php7.0-libvirt-php \ + php7.0-lua \ + php7.0-lz4 \ + php7.0-mailparse \ + php7.0-mbstring \ + php7.0-mcrypt \ + php7.0-memcache \ + php7.0-memcached \ + php7.0-mongodb \ + php7.0-msgpack \ + php7.0-mysql \ + php7.0-oauth \ + php7.0-odbc \ + php7.0-opcache \ + php7.0-pgsql \ + php7.0-phpdbg \ + php7.0-pinba \ +# php7.0-pq \ + php7.0-propro \ + php7.0-protobuf \ + php7.0-ps \ + php7.0-pspell \ + php7.0-radius \ + php7.0-raphf \ + php7.0-rdkafka \ + php7.0-readline \ + php7.0-recode \ + php7.0-redis \ + php7.0-rrd \ + php7.0-smbclient \ + php7.0-snmp \ + php7.0-soap \ + php7.0-sodium \ + php7.0-solr \ + php7.0-sqlite3 \ + php7.0-ssh2 \ + php7.0-stomp \ + php7.0-sybase \ + php7.0-tideways \ + php7.0-tidy \ + php7.0-uploadprogress \ + php7.0-uuid \ + php7.0-vips \ + php7.0-xdebug \ + php7.0-xhprof \ + php7.0-xml \ + php7.0-xmlrpc \ + php7.0-xsl \ +# php7.0-yac \ + php7.0-yaml \ + php7.0-zip \ + php7.0-zmq \ + php7.0-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ +# php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.0 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +RUN pecl install cassandra && \ + echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.0.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node8/Makefile b/linux/ecosystem/gitlab/runner/php70/Makefile similarity index 94% rename from linux/obsolete/teamcity/agent/node8/Makefile rename to linux/ecosystem/gitlab/runner/php70/Makefile index 1e4371492..b88fa3708 100644 --- a/linux/obsolete/teamcity/agent/node8/Makefile +++ b/linux/ecosystem/gitlab/runner/php70/Makefile @@ -7,10 +7,10 @@ app: make clean build: - make build-buildah + kaniko-wrapper --version deploy: - make deploy-buildah + make deploy-kaniko build-buildah: buildah-wrapper --build diff --git a/linux/ecosystem/gitlab/runner/php70/README.md b/linux/ecosystem/gitlab/runner/php70/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php70/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php70/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php70/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php70/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php70/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php70/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php70/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php70/docker-compose.yml b/linux/ecosystem/gitlab/runner/php70/docker-compose.yml new file mode 100644 index 000000000..da86e8a67 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php70/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:php7.0" + build: + context: . diff --git a/linux/ecosystem/gitlab/runner/php70/usr/lib/php/20151012/phpBolt-extension-1.0.4-php70.so b/linux/ecosystem/gitlab/runner/php70/usr/lib/php/20151012/phpBolt-extension-1.0.4-php70.so new file mode 100644 index 000000000..e6d3abfda Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php70/usr/lib/php/20151012/phpBolt-extension-1.0.4-php70.so differ diff --git a/linux/ecosystem/gitlab/runner/php70/usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so b/linux/ecosystem/gitlab/runner/php70/usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so new file mode 100644 index 000000000..e6d3abfda Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php70/usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so differ diff --git a/linux/ecosystem/gitlab/runner/php71/Dockerfile b/linux/ecosystem/gitlab/runner/php71/Dockerfile new file mode 100644 index 000000000..de52c8441 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php71/Dockerfile @@ -0,0 +1,386 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.1 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20160303 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +#installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.1 \ + php7.1-common \ + php7.1-dev \ + php7.1-fpm \ + php7.1-cli \ + php7.1-xml \ + php7.1-cgi && \ + update-alternatives --set php /usr/bin/php7.1 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=7.1 +ENV PHP_MODULE_PATH=/usr/lib/php/20160303 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.1 \ + php7.1-cli \ + php7.1-common \ + php7.1-dev \ + php7.1-amqp \ + php7.1-apcu-bc \ + php7.1-apcu \ + php7.1-bcmath \ + php7.1-bz2 \ + php7.1-cgi \ + php7.1-curl \ + php7.1-dba \ + php7.1-decimal \ + php7.1-dio \ + php7.1-ds \ + php7.1-enchant \ + php7.1-excimer \ + php7.1-fpm \ + php7.1-gd \ + php7.1-gearman \ + php7.1-geoip \ +# php7.1-gmagick \ + php7.1-gmp \ + php7.1-gnupg \ + php7.1-grpc \ + php7.1-http \ + php7.1-igbinary \ + php7.1-imagick \ + php7.1-imap \ + php7.1-inotify \ + php7.1-interbase \ + php7.1-intl \ + php7.1-json \ + php7.1-ldap \ + php7.1-libvirt-php \ + php7.1-lua \ + php7.1-lz4 \ + php7.1-mailparse \ + php7.1-mbstring \ + php7.1-mcrypt \ + php7.1-memcache \ + php7.1-memcached \ + php7.1-mongodb \ + php7.1-msgpack \ + php7.1-mysql \ + php7.1-oauth \ + php7.1-odbc \ + php7.1-opcache \ + php7.1-pcov \ + php7.1-pgsql \ + php7.1-phpdbg \ + php7.1-pinba \ +# php7.1-pq \ + php7.1-propro \ + php7.1-protobuf \ + php7.1-ps \ + php7.1-pspell \ + php7.1-radius \ + php7.1-raphf \ + php7.1-rdkafka \ + php7.1-readline \ + php7.1-recode \ + php7.1-redis \ + php7.1-rrd \ + php7.1-smbclient \ + php7.1-snmp \ + php7.1-soap \ + php7.1-sodium \ + php7.1-solr \ + php7.1-sqlite3 \ + php7.1-ssh2 \ + php7.1-stomp \ + php7.1-sybase \ + php7.1-tideways \ + php7.1-tidy \ + php7.1-uopz \ + php7.1-uploadprogress \ + php7.1-uuid \ + php7.1-vips \ + php7.1-xdebug \ + php7.1-xhprof \ + php7.1-xml \ + php7.1-xmlrpc \ + php7.1-xsl \ +# php7.1-yac \ + php7.1-yaml \ + php7.1-zip \ + php7.1-zmq \ + php7.1-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ +# php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.2,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.1 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +RUN pecl install cassandra && \ + echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.1.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node9/Makefile b/linux/ecosystem/gitlab/runner/php71/Makefile similarity index 94% rename from linux/obsolete/teamcity/agent/node9/Makefile rename to linux/ecosystem/gitlab/runner/php71/Makefile index 1e4371492..b88fa3708 100644 --- a/linux/obsolete/teamcity/agent/node9/Makefile +++ b/linux/ecosystem/gitlab/runner/php71/Makefile @@ -7,10 +7,10 @@ app: make clean build: - make build-buildah + kaniko-wrapper --version deploy: - make deploy-buildah + make deploy-kaniko build-buildah: buildah-wrapper --build diff --git a/linux/ecosystem/gitlab/runner/php71/README.md b/linux/ecosystem/gitlab/runner/php71/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php71/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php71/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php71/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php71/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php71/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php71/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php71/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php71/docker-compose.yml b/linux/ecosystem/gitlab/runner/php71/docker-compose.yml new file mode 100644 index 000000000..99724a857 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php71/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:php7.1" + build: + context: . diff --git a/linux/ecosystem/gitlab/runner/php71/usr/lib/php/20160303/phpBolt-extension-1.0.4-php71.so b/linux/ecosystem/gitlab/runner/php71/usr/lib/php/20160303/phpBolt-extension-1.0.4-php71.so new file mode 100644 index 000000000..75149ffcf Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php71/usr/lib/php/20160303/phpBolt-extension-1.0.4-php71.so differ diff --git a/linux/ecosystem/gitlab/runner/php71/usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so b/linux/ecosystem/gitlab/runner/php71/usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so new file mode 100644 index 000000000..75149ffcf Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php71/usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so differ diff --git a/linux/ecosystem/gitlab/runner/php72/Dockerfile b/linux/ecosystem/gitlab/runner/php72/Dockerfile new file mode 100644 index 000000000..472b8eab6 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php72/Dockerfile @@ -0,0 +1,388 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.2 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20170718 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.2 \ + php7.2-common \ + php7.2-dev \ + php7.2-fpm \ + php7.2-cli \ + php7.2-xml \ + php7.2-cgi && \ + update-alternatives --set php /usr/bin/php7.2 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_PATH=/usr/lib/php/20170718 +ENV PHP_VER=7.2 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.2 \ + php7.2-cli \ + php7.2-common \ + php7.2-dev \ + php7.2-amqp \ + php7.2-apcu-bc \ + php7.2-apcu \ + php7.2-ast \ + php7.2-bcmath \ + php7.2-bz2 \ + php7.2-cgi \ + php7.2-curl \ + php7.2-dba \ + php7.2-decimal \ + php7.2-dio \ + php7.2-ds \ + php7.2-enchant \ + php7.2-excimer \ + php7.2-fpm \ + php7.2-gd \ + php7.2-gearman \ + php7.2-geoip \ +# php7.2-gmagick \ + php7.2-gmp \ + php7.2-gnupg \ + php7.2-grpc \ + php7.2-http \ + php7.2-igbinary \ + php7.2-imagick \ + php7.2-imap \ + php7.2-inotify \ + php7.2-interbase \ + php7.2-intl \ + php7.2-json \ + php7.2-ldap \ + php7.2-libvirt-php \ + php7.2-lua \ + php7.2-lz4 \ + php7.2-mailparse \ + php7.2-maxminddb \ + php7.2-mbstring \ + php7.2-mcrypt \ + php7.2-memcache \ + php7.2-memcached \ + php7.2-mongodb \ + php7.2-msgpack \ + php7.2-mysql \ + php7.2-oauth \ + php7.2-odbc \ + php7.2-opcache \ + php7.2-pcov \ + php7.2-pgsql \ +# php7.2-phalcon4 \ + php7.2-phpdbg \ + php7.2-pinba \ +# php7.2-pq \ + php7.2-propro \ + php7.2-protobuf \ + php7.2-ps \ + php7.2-pspell \ + php7.2-radius \ + php7.2-raphf \ + php7.2-rdkafka \ + php7.2-readline \ + php7.2-recode \ + php7.2-redis \ + php7.2-rrd \ + php7.2-smbclient \ + php7.2-snmp \ + php7.2-soap \ + php7.2-solr \ + php7.2-sqlite3 \ + php7.2-ssh2 \ + php7.2-stomp \ + php7.2-sybase \ + php7.2-tideways \ + php7.2-tidy \ + php7.2-uopz \ + php7.2-uploadprogress \ + php7.2-uuid \ + php7.2-vips \ + php7.2-xdebug \ + php7.2-xhprof \ + php7.2-xml \ + php7.2-xmlrpc \ + php7.2-xsl \ +# php7.2-yac \ + php7.2-yaml \ + php7.2-zip \ + php7.2-zmq \ + php7.2-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ +# php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.2 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20170718/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.2.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/obsolete/teamcity/agent/php7.2/Makefile b/linux/ecosystem/gitlab/runner/php72/Makefile similarity index 94% rename from linux/obsolete/teamcity/agent/php7.2/Makefile rename to linux/ecosystem/gitlab/runner/php72/Makefile index 1e4371492..b88fa3708 100644 --- a/linux/obsolete/teamcity/agent/php7.2/Makefile +++ b/linux/ecosystem/gitlab/runner/php72/Makefile @@ -7,10 +7,10 @@ app: make clean build: - make build-buildah + kaniko-wrapper --version deploy: - make deploy-buildah + make deploy-kaniko build-buildah: buildah-wrapper --build diff --git a/linux/ecosystem/gitlab/runner/php72/README.md b/linux/ecosystem/gitlab/runner/php72/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php72/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php72/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php72/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php72/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php72/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php72/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php72/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/gitlab/runner/php7.2/docker-compose.yml b/linux/ecosystem/gitlab/runner/php72/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/php7.2/docker-compose.yml rename to linux/ecosystem/gitlab/runner/php72/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/cassandra.so b/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/cassandra.so new file mode 100644 index 000000000..fb54b0cbd Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/cassandra.so differ diff --git a/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/phpBolt-extension-1.0.4-php72.so b/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/phpBolt-extension-1.0.4-php72.so new file mode 100644 index 000000000..d4aac7cd7 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/phpBolt-extension-1.0.4-php72.so differ diff --git a/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so b/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so new file mode 100644 index 000000000..d4aac7cd7 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php72/usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so differ diff --git a/linux/ecosystem/gitlab/runner/php73/Dockerfile b/linux/ecosystem/gitlab/runner/php73/Dockerfile new file mode 100644 index 000000000..523ec2011 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php73/Dockerfile @@ -0,0 +1,392 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.3 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20180731 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.3 \ + php7.3-common \ + php7.3-dev \ + php7.3-fpm \ + php7.3-cli \ + php7.3-xml \ + php7.3-cgi && \ + update-alternatives --set php /usr/bin/php7.3 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_PATH=/usr/lib/php/20180731 +ENV PHP_VER=7.3 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.3 \ + php7.3-cli \ + php7.3-common \ + php7.3-dev \ + php7.3-amqp \ + php7.3-apcu-bc \ + php7.3-apcu \ + php7.3-ast \ + php7.3-bcmath \ + php7.3-bz2 \ + php7.3-cgi \ + php7.3-curl \ + php7.3-dba \ + php7.3-decimal \ + php7.3-dio \ + php7.3-ds \ + php7.3-enchant \ + php7.3-excimer \ + php7.3-fpm \ + php7.3-gd \ + php7.3-gearman \ + php7.3-geoip \ +# php7.3-gmagick \ + php7.3-gmp \ + php7.3-gnupg \ + php7.3-grpc \ + php7.3-http \ + php7.3-igbinary \ + php7.3-imagick \ + php7.3-imap \ + php7.3-inotify \ + php7.3-interbase \ + php7.3-intl \ + php7.3-json \ + php7.3-ldap \ + php7.3-libvirt-php \ + php7.3-lua \ + php7.3-lz4 \ + php7.3-mailparse \ + php7.3-maxminddb \ + php7.3-mbstring \ + php7.3-mcrypt \ + php7.3-memcache \ + php7.3-memcached \ + php7.3-mongodb \ + php7.3-msgpack \ + php7.3-mysql \ + php7.3-oauth \ + php7.3-odbc \ + php7.3-opcache \ + php7.3-pcov \ + php7.3-pgsql \ +# php7.3-phalcon4 \ + php7.3-phpdbg \ + php7.3-pinba \ +# php7.3-pq \ + php7.3-propro \ + php7.3-protobuf \ + php7.3-ps \ + php7.3-pspell \ +# php7.3-psr \ + php7.3-radius \ + php7.3-raphf \ + php7.3-rdkafka \ + php7.3-readline \ + php7.3-recode \ + php7.3-redis \ + php7.3-rrd \ + php7.3-smbclient \ + php7.3-snmp \ + php7.3-soap \ + php7.3-solr \ + php7.3-sqlite3 \ + php7.3-ssh2 \ + php7.3-stomp \ + php7.3-sybase \ + php7.3-tideways \ + php7.3-tidy \ + php7.3-uopz \ + php7.3-uploadprogress \ + php7.3-uuid \ + php7.3-vips \ + php7.3-xdebug \ + php7.3-xhprof \ + php7.3-xml \ + php7.3-xmlrpc \ + php7.3-xsl \ +# php7.3-yac \ + php7.3-yaml \ + php7.3-zip \ + php7.3-zmq \ + php7.3-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ +# php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.3 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gettext \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20180731/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.3.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension = ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/php73/Makefile b/linux/ecosystem/gitlab/runner/php73/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php73/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/php73/README.md b/linux/ecosystem/gitlab/runner/php73/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php73/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php73/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php73/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php73/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php73/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php73/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php73/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/gitlab/runner/php7.3/docker-compose.yml b/linux/ecosystem/gitlab/runner/php73/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/php7.3/docker-compose.yml rename to linux/ecosystem/gitlab/runner/php73/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/cassandra.so b/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/cassandra.so new file mode 100644 index 000000000..48ec4a0af Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/cassandra.so differ diff --git a/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/phpBolt-extension-1.0.4-php73.so b/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/phpBolt-extension-1.0.4-php73.so new file mode 100644 index 000000000..b469217df Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/phpBolt-extension-1.0.4-php73.so differ diff --git a/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so b/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so new file mode 100644 index 000000000..b469217df Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php73/usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so differ diff --git a/linux/ecosystem/gitlab/runner/php74/Dockerfile b/linux/ecosystem/gitlab/runner/php74/Dockerfile new file mode 100644 index 000000000..3c13515a1 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php74/Dockerfile @@ -0,0 +1,410 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ENV PHP_MODULE_PATH=/usr/lib/php/20190902 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +###################################################################installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + smbclient libsmbclient libsmbclient-dev \ +# php-pear \ + php7.4 \ + php7.4-common \ + php7.4-dev \ + php7.4-fpm \ + php7.4-cli \ + php7.4-xml \ + php7.4-cgi && \ + update-alternatives --set php /usr/bin/php7.4 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +# compilling smbclient +################################################################## +#RUN pecl install smbclient && \ +# cp ${PHP_MODULE_PATH}/smbclient.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_PATH=/usr/lib/php/20190902 +ENV PHP_VER=7.4 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.4 \ + php7.4-cli \ + php7.4-common \ + php7.4-dev \ + php7.4-amqp \ + php7.4-apcu-bc \ + php7.4-apcu \ + php7.4-ast \ + php7.4-bcmath \ + php7.4-bz2 \ + php7.4-cgi \ + php7.4-curl \ + php7.4-dba \ + php7.4-decimal \ + php7.4-dio \ + php7.4-ds \ + php7.4-enchant \ + php7.4-excimer \ + php7.4-fpm \ + php7.4-gd \ + php7.4-gearman \ + php7.4-geoip \ +# php7.4-gmagick \ + php7.4-gmp \ + php7.4-gnupg \ + php7.4-grpc \ + php7.4-http \ + php7.4-igbinary \ + php7.4-imagick \ + php7.4-imap \ + php7.4-inotify \ + php7.4-interbase \ + php7.4-intl \ + php7.4-json \ + php7.4-ldap \ + php7.4-libvirt-php \ + php7.4-lua \ + php7.4-lz4 \ + php7.4-mailparse \ + php7.4-maxminddb \ + php7.4-mbstring \ + php7.4-mcrypt \ + php7.4-memcache \ + php7.4-memcached \ + php7.4-mongodb \ + php7.4-msgpack \ + php7.4-mysql \ + php7.4-oauth \ + php7.4-odbc \ + php7.4-opcache \ + php7.4-pcov \ + php7.4-pgsql \ + php7.4-phalcon4 \ +# php7.4-phalcon5 \ + php7.4-phpdbg \ + php7.4-pinba \ + php7.4-pq \ + php7.4-propro \ + php7.4-protobuf \ + php7.4-ps \ + php7.4-pspell \ + php7.4-psr \ + php7.4-radius \ + php7.4-raphf \ + php7.4-rdkafka \ + php7.4-readline \ + php7.4-redis \ + php7.4-rrd \ + php7.4-smbclient \ + php7.4-snmp \ + php7.4-soap \ + php7.4-solr \ + php7.4-sqlite3 \ + php7.4-ssh2 \ + php7.4-stomp \ + php7.4-sybase \ + php7.4-tideways \ + php7.4-tidy \ + php7.4-uopz \ + php7.4-uploadprogress \ + php7.4-uuid \ + php7.4-vips \ + php7.4-xdebug \ + php7.4-xhprof \ + php7.4-xml \ + php7.4-xmlrpc \ + php7.4-xsl \ +# php7.4-yac \ + php7.4-yaml \ + php7.4-zip \ + php7.4-zmq \ + php7.4-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ +# php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.4 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20190902/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.4.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension = ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing smbclient addon +################################################################## +#COPY --from=builder /builds/export/smbclient.so ${PHP_MODULE_PATH} +#RUN echo "extension = ${PHP_MODULE_PATH}/smbclient.so" > ${SMB_PHP_INI} && \ +# ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cgi/conf.d/smbclient.ini && \ +# ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cli/conf.d/smbclient.ini && \ +# ln -sf ${SMB_PHP_INI} ${PHP_DIR}/fpm/conf.d/smbclient.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/php74/Makefile b/linux/ecosystem/gitlab/runner/php74/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php74/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/php74/README.md b/linux/ecosystem/gitlab/runner/php74/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php74/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php74/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php74/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php74/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php74/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php74/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php74/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/gitlab/runner/php7.4/docker-compose.yml b/linux/ecosystem/gitlab/runner/php74/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/php7.4/docker-compose.yml rename to linux/ecosystem/gitlab/runner/php74/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/cassandra.so b/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/cassandra.so new file mode 100644 index 000000000..9f6332a44 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/cassandra.so differ diff --git a/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so b/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so new file mode 100644 index 000000000..9e8df1195 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so differ diff --git a/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so b/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so new file mode 100644 index 000000000..9e8df1195 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php74/usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so differ diff --git a/linux/ecosystem/gitlab/runner/php80/Dockerfile b/linux/ecosystem/gitlab/runner/php80/Dockerfile new file mode 100644 index 000000000..4b0c5daaf --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php80/Dockerfile @@ -0,0 +1,304 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_VER=20200930 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_VER=8.0 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.0 \ + php8.0-cli \ + php8.0-common \ + php8.0-dev \ + php8.0-amqp \ + php8.0-apcu \ + php8.0-ast \ + php8.0-bcmath \ + php8.0-bz2 \ + php8.0-cgi \ + php8.0-curl \ + php8.0-dba \ + php8.0-decimal \ + php8.0-dio \ + php8.0-ds \ + php8.0-enchant \ + php8.0-excimer \ + php8.0-fpm \ + php8.0-gd \ + php8.0-gearman \ +# php8.0-gmagick \ + php8.0-gmp \ + php8.0-gnupg \ + php8.0-grpc \ + php8.0-http \ + php8.0-igbinary \ + php8.0-imagick \ + php8.0-imap \ + php8.0-inotify \ + php8.0-interbase \ + php8.0-intl \ + php8.0-ldap \ + php8.0-libvirt-php \ + php8.0-lz4 \ + php8.0-mailparse \ + php8.0-maxminddb \ + php8.0-mbstring \ + php8.0-mcrypt \ + php8.0-memcache \ + php8.0-memcached \ + php8.0-mongodb \ + php8.0-msgpack \ + php8.0-mysql \ + php8.0-oauth \ + php8.0-odbc \ + php8.0-opcache \ + php8.0-pcov \ + php8.0-pgsql \ + php8.0-phalcon5 \ + php8.0-phpdbg \ + php8.0-pinba \ +# php8.0-pq \ +# php8.0-propro \ + php8.0-protobuf \ + php8.0-ps \ + php8.0-pspell \ +# php8.0-psr \ + php8.0-raphf \ + php8.0-rdkafka \ + php8.0-readline \ + php8.0-redis \ + php8.0-rrd \ + php8.0-smbclient \ + php8.0-snmp \ + php8.0-soap \ + php8.0-solr \ + php8.0-sqlite3 \ + php8.0-ssh2 \ + php8.0-stomp \ + php8.0-swoole \ + php8.0-sybase \ + php8.0-tideways \ + php8.0-tidy \ + php8.0-uopz \ + php8.0-uploadprogress \ + php8.0-uuid \ + php8.0-vips \ + php8.0-xdebug \ + php8.0-xhprof \ + php8.0-xml \ + php8.0-xmlrpc \ + php8.0-xsl \ +# php8.0-yac \ + php8.0-yaml \ + php8.0-zip \ + php8.0-zmq \ + php8.0-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ +# php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php8.0 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20200930/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +RUN wget -q --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80.so --random-wait -O ${PHP_MODULE_PATH}/perforce_php80.so && \ + wget -q --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.0.2.so --random-wait -O ${PHP_MODULE_PATH}/perforce_php80-ssl1.0.2.so && \ + wget -q --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.1.1.so --random-wait -O ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so + +#COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} + +RUN echo "extension = ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so" > ${P4_PHP_INI} && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +# NOT OFFICIALLY SUPPORTED +# +#ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +#RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ +# cp /tmp/ioncube/ioncube_loader_lin_8.0.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/apache2/php.ini && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/php80/Makefile b/linux/ecosystem/gitlab/runner/php80/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php80/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/php80/README.md b/linux/ecosystem/gitlab/runner/php80/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php80/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php80/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php80/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php80/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php80/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php80/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php80/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/gitlab/runner/php8.0/docker-compose.yml b/linux/ecosystem/gitlab/runner/php80/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/php8.0/docker-compose.yml rename to linux/ecosystem/gitlab/runner/php80/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/cassandra.so b/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/cassandra.so new file mode 100644 index 000000000..c7de65288 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/cassandra.so differ diff --git a/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/phpBolt-extension-1.0.4-php80.so b/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/phpBolt-extension-1.0.4-php80.so new file mode 100644 index 000000000..6813727b3 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/phpBolt-extension-1.0.4-php80.so differ diff --git a/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so b/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so new file mode 100644 index 000000000..6813727b3 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php80/usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so differ diff --git a/linux/ecosystem/gitlab/runner/php81/Dockerfile b/linux/ecosystem/gitlab/runner/php81/Dockerfile new file mode 100644 index 000000000..83d7c5fd7 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php81/Dockerfile @@ -0,0 +1,286 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.1 +ENV PHP_MODULE_VER=20210902 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.1 \ + php8.1-cli \ + php8.1-common \ + php8.1-dev \ + php8.1-amqp \ + php8.1-apcu \ + php8.1-ast \ + php8.1-bcmath \ + php8.1-bz2 \ + php8.1-cgi \ + php8.1-curl \ + php8.1-dba \ + php8.1-decimal \ + php8.1-dio \ + php8.1-ds \ + php8.1-enchant \ + php8.1-excimer \ + php8.1-fpm \ + php8.1-gd \ + php8.1-gearman \ +# php8.1-gmagick \ + php8.1-gmp \ + php8.1-gnupg \ + php8.1-grpc \ + php8.1-http \ + php8.1-igbinary \ + php8.1-imagick \ + php8.1-imap \ + php8.1-inotify \ + php8.1-interbase \ + php8.1-intl \ + php8.1-ldap \ + php8.1-libvirt-php \ + php8.1-lz4 \ + php8.1-mailparse \ + php8.1-maxminddb \ + php8.1-mbstring \ + php8.1-mcrypt \ + php8.1-memcache \ + php8.1-memcached \ + php8.1-mongodb \ + php8.1-msgpack \ + php8.1-mysql \ + php8.1-oauth \ + php8.1-odbc \ + php8.1-opcache \ + php8.1-pcov \ + php8.1-pgsql \ +# php8.1-phalcon5 \ + php8.1-phpdbg \ + php8.1-pinba \ +# php8.1-pq \ +# php8.1-propro \ + php8.1-protobuf \ + php8.1-ps \ + php8.1-pspell \ +# php8.1-psr \ + php8.1-raphf \ + php8.1-rdkafka \ + php8.1-readline \ + php8.1-redis \ + php8.1-rrd \ + php8.1-smbclient \ + php8.1-snmp \ + php8.1-soap \ + php8.1-solr \ + php8.1-sqlite3 \ + php8.1-ssh2 \ + php8.1-stomp \ + php8.1-swoole \ + php8.1-sybase \ + php8.1-tideways \ + php8.1-tidy \ + php8.1-uopz \ + php8.1-uploadprogress \ + php8.1-uuid \ + php8.1-vips \ + php8.1-xdebug \ + php8.1-xhprof \ + php8.1-xml \ + php8.1-xmlrpc \ + php8.1-xsl \ +# php8.1-yac \ + php8.1-yaml \ + php8.1-zip \ + php8.1-zmq \ + php8.1-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ +# php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php8.1 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20210902/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.1.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/php81/Makefile b/linux/ecosystem/gitlab/runner/php81/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php81/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/php81/README.md b/linux/ecosystem/gitlab/runner/php81/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php81/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php81/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php81/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php81/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php81/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php81/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php81/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/gitlab/runner/php8.1/docker-compose.yml b/linux/ecosystem/gitlab/runner/php81/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/php8.1/docker-compose.yml rename to linux/ecosystem/gitlab/runner/php81/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/cassandra.so b/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/cassandra.so new file mode 100644 index 000000000..f2d94833c Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/cassandra.so differ diff --git a/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so b/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so new file mode 100644 index 000000000..b04d217c3 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so differ diff --git a/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so b/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so new file mode 100644 index 000000000..b04d217c3 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php81/usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so differ diff --git a/linux/ecosystem/gitlab/runner/php82/Dockerfile b/linux/ecosystem/gitlab/runner/php82/Dockerfile new file mode 100644 index 000000000..10f2e85ce --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php82/Dockerfile @@ -0,0 +1,286 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.2 +ENV PHP_MODULE_VER=20220829 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.2 \ + php8.2-cli \ + php8.2-common \ + php8.2-dev \ + php8.2-amqp \ + php8.2-apcu \ + php8.2-ast \ + php8.2-bcmath \ + php8.2-bz2 \ + php8.2-cgi \ + php8.2-curl \ + php8.2-dba \ + php8.2-decimal \ + php8.2-dio \ + php8.2-ds \ + php8.2-enchant \ + php8.2-excimer \ + php8.2-fpm \ + php8.2-gd \ + php8.2-gearman \ +# php8.2-gmagick \ + php8.2-gmp \ + php8.2-gnupg \ + php8.2-grpc \ + php8.2-http \ + php8.2-igbinary \ + php8.2-imagick \ + php8.2-imap \ + php8.2-inotify \ + php8.2-interbase \ + php8.2-intl \ + php8.2-ldap \ + php8.2-libvirt-php \ + php8.2-lz4 \ + php8.2-mailparse \ + php8.2-maxminddb \ + php8.2-mbstring \ + php8.2-mcrypt \ + php8.2-memcache \ + php8.2-memcached \ + php8.2-mongodb \ + php8.2-msgpack \ + php8.2-mysql \ + php8.2-oauth \ + php8.2-odbc \ + php8.2-opcache \ + php8.2-pcov \ + php8.2-pgsql \ +# php8.2-phalcon5 \ + php8.2-phpdbg \ + php8.2-pinba \ +# php8.2-pq \ +# php8.2-propro \ + php8.2-protobuf \ + php8.2-ps \ + php8.2-pspell \ + php8.2-psr \ + php8.2-raphf \ + php8.2-rdkafka \ + php8.2-readline \ + php8.2-redis \ + php8.2-rrd \ + php8.2-smbclient \ + php8.2-snmp \ + php8.2-soap \ + php8.2-solr \ + php8.2-sqlite3 \ + php8.2-ssh2 \ + php8.2-stomp \ + php8.2-swoole \ + php8.2-sybase \ + php8.2-tideways \ + php8.2-tidy \ + php8.2-uopz \ + php8.2-uploadprogress \ + php8.2-uuid \ + php8.2-vips \ + php8.2-xdebug \ + php8.2-xhprof \ + php8.2-xml \ + php8.2-xmlrpc \ + php8.2-xsl \ +# php8.2-yac \ + php8.2-yaml \ + php8.2-zip \ + php8.2-zmq \ + php8.2-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ +# php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php8.2 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20220829/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.2.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/php82/Makefile b/linux/ecosystem/gitlab/runner/php82/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php82/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/php82/README.md b/linux/ecosystem/gitlab/runner/php82/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php82/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php82/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php82/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php82/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php82/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php82/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php82/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/gitlab/runner/php8.2/docker-compose.yml b/linux/ecosystem/gitlab/runner/php82/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/php8.2/docker-compose.yml rename to linux/ecosystem/gitlab/runner/php82/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/cassandra.so b/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/cassandra.so new file mode 100644 index 000000000..2e94ad443 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/cassandra.so differ diff --git a/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/phpBolt-extension-1.0.4-php82.so b/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/phpBolt-extension-1.0.4-php82.so new file mode 100644 index 000000000..ed75ab215 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/phpBolt-extension-1.0.4-php82.so differ diff --git a/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so b/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so new file mode 100644 index 000000000..ed75ab215 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php82/usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so differ diff --git a/linux/ecosystem/gitlab/runner/php83/Dockerfile b/linux/ecosystem/gitlab/runner/php83/Dockerfile new file mode 100644 index 000000000..f37e347b1 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php83/Dockerfile @@ -0,0 +1,283 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.3 +ENV PHP_MODULE_VER=20230831 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.3 \ + php8.3-cli \ + php8.3-common \ + php8.3-dev \ + php8.3-amqp \ + php8.3-apcu \ + php8.3-ast \ + php8.3-bcmath \ + php8.3-bz2 \ + php8.3-cgi \ + php8.3-curl \ + php8.3-dba \ + php8.3-decimal \ + php8.3-dio \ + php8.3-ds \ + php8.3-enchant \ + php8.3-excimer \ + php8.3-fpm \ + php8.3-gd \ + php8.3-gearman \ +# php8.3-gmagick \ + php8.3-gmp \ + php8.3-gnupg \ + php8.3-grpc \ + php8.3-http \ + php8.3-igbinary \ + php8.3-imagick \ + php8.3-imap \ + php8.3-inotify \ + php8.3-interbase \ + php8.3-intl \ + php8.3-ldap \ + php8.3-libvirt-php \ + php8.3-mailparse \ + php8.3-maxminddb \ + php8.3-mbstring \ + php8.3-mcrypt \ + php8.3-memcache \ + php8.3-memcached \ + php8.3-mongodb \ + php8.3-msgpack \ + php8.3-mysql \ + php8.3-oauth \ + php8.3-odbc \ + php8.3-opcache \ + php8.3-pcov \ + php8.3-pgsql \ +# php8.3-phalcon5 \ + php8.3-phpdbg \ + php8.3-pinba \ +# php8.3-pq \ + php8.3-protobuf \ + php8.3-ps \ + php8.3-pspell \ +# php8.3-psr \ + php8.3-raphf \ + php8.3-rdkafka \ + php8.3-readline \ + php8.3-redis \ + php8.3-rrd \ + php8.3-smbclient \ + php8.3-snmp \ + php8.3-soap \ + php8.3-solr \ + php8.3-sqlite3 \ + php8.3-ssh2 \ + php8.3-stomp \ + php8.3-swoole \ + php8.3-sybase \ + php8.3-tidy \ + php8.3-uopz \ + php8.3-uploadprogress \ + php8.3-uuid \ + php8.3-vips \ + php8.3-xdebug \ + php8.3-xhprof \ + php8.3-xml \ + php8.3-xmlrpc \ + php8.3-xsl \ +# php8.3-yac \ + php8.3-yaml \ + php8.3-zip \ + php8.3-zmq \ + php8.3-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ +# php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.4} && \ + update-alternatives --set php /usr/bin/php8.3 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +#COPY usr/lib/php/20220829/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +#RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +## ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.3.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/php83/Makefile b/linux/ecosystem/gitlab/runner/php83/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php83/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/php83/README.md b/linux/ecosystem/gitlab/runner/php83/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php83/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php83/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php83/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php83/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php83/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php83/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php83/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/gitlab/runner/php8.3/docker-compose.yml b/linux/ecosystem/gitlab/runner/php83/docker-compose.yml similarity index 100% rename from linux/obsolete/gitlab/runner/php8.3/docker-compose.yml rename to linux/ecosystem/gitlab/runner/php83/docker-compose.yml diff --git a/linux/ecosystem/gitlab/runner/php83/usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so b/linux/ecosystem/gitlab/runner/php83/usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so new file mode 100644 index 000000000..86e34521d Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php83/usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so differ diff --git a/linux/ecosystem/gitlab/runner/php84/Dockerfile b/linux/ecosystem/gitlab/runner/php84/Dockerfile new file mode 100644 index 000000000..3ef6e2638 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php84/Dockerfile @@ -0,0 +1,230 @@ +FROM hub.epicm.org/epicmorg/gitlab-runner:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.4 +ENV PHP_MODULE_VER=20240924 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.4 \ + php8.4-cli \ + php8.4-common \ + php8.4-dev \ + php8.4-bcmath \ + php8.4-bz2 \ + php8.4-cgi \ + php8.4-curl \ + php8.4-dba \ + php8.4-enchant \ + php8.4-fpm \ + php8.4-gd \ + php8.4-gmp \ + php8.4-interbase \ + php8.4-intl \ + php8.4-ldap \ + php8.4-mbstring \ + php8.4-mysql \ + php8.4-odbc \ + php8.4-opcache \ + php8.4-pgsql \ + php8.4-phpdbg \ + php8.4-readline \ + php8.4-snmp \ + php8.4-soap \ + php8.4-sqlite3 \ + php8.4-sybase \ + php8.4-tidy \ + php8.4-xml \ + php8.4-xsl \ + php8.4-zip \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* && \ +# php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3} && \ + update-alternatives --set php /usr/bin/php8.4 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +#COPY usr/lib/php/20240924/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +#RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +## ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing timezonedb addon +################################################################## +#RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +#COPY usr/lib/php/20240924/phpBolt-extension-1.0.5-php84.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so +##RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/apache2/php.ini && \ +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.4.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +RUN updatedb diff --git a/linux/ecosystem/gitlab/runner/php84/Makefile b/linux/ecosystem/gitlab/runner/php84/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php84/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/gitlab/runner/php84/README.md b/linux/ecosystem/gitlab/runner/php84/README.md new file mode 100644 index 000000000..7177183de --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php84/README.md @@ -0,0 +1,93 @@ +## TeamCity Minimal Build Agent + +[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. + + More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). + +The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. +You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. + +This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/gitlab-runner](https://hub.docker.com/r/jetbrains/gitlab-runner/). + +## How to Use This Image + +Pull the TeamCity minimal image from the Docker Hub Repository: + +``` +jetbrains/teamcity-minimal-agent +``` +  +and use the following command to start a container with TeamCity agent running inside +a Linux container: + +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + jetbrains/teamcity-minimal-agent +``` +  +or a Windows container: +``` +docker run -it -e SERVER_URL="" + -v :C:/BuildAgent/conf + jetbrains/teamcity-minimal-agent +``` +where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. +`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. + +Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. + +When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). + +All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. + +TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. + +### Agent Image Environment Variables + +- **SERVER_URL** - URL of the TeamCity server agent will connect to +- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted +- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. +- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected +- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default + +### Windows Containers Limitations + +The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). + +## Customization + +You can customize the image via the usual Docker procedure: + +1. Run the image +``` +docker run -it -e SERVER_URL="" \ + -v :/data/teamcity_agent/conf \ + --name="my-customized-agent" \ + jetbrains/teamcity-minimal-agent \ +``` +2. Enter the container +``` +docker exec -it my-customized-agent bash +``` + +3. Change whatever you need +4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container +``` +docker commit my-customized-agent +``` + +## License + +The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). +TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). + +## Feedback + +Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). + +## Other TeamCity Images +* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) +* [Build Agent](https://hub.docker.com/r/jetbrains/gitlab-runner/) diff --git a/linux/ecosystem/gitlab/runner/php84/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/gitlab/runner/php84/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php84/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php84/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/gitlab/runner/php84/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/gitlab/runner/php84/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/ecosystem/gitlab/runner/php84/docker-compose.yml b/linux/ecosystem/gitlab/runner/php84/docker-compose.yml new file mode 100644 index 000000000..5ff0f7607 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/php84/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/gitlab-runner:php8.4" + build: + context: . diff --git a/linux/ecosystem/monero/p2pool/Dockerfile b/linux/ecosystem/monero/p2pool/Dockerfile index 8e43e227b..ee55d7eee 100644 --- a/linux/ecosystem/monero/p2pool/Dockerfile +++ b/linux/ecosystem/monero/p2pool/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## ENV P2POOL_DIR=/p2pool -ENV P2POOL_VERSION=4.1 +ENV P2POOL_VERSION=4.4 ENV P2POOL_DOWNLOAD_URL=https://github.com/SChernykh/p2pool/releases/download/v${P2POOL_VERSION}/p2pool-v${P2POOL_VERSION}-linux-x64.tar.gz ################################################################## diff --git a/linux/ecosystem/nginx/1.14.2/main/Dockerfile b/linux/ecosystem/nginx/1.14.2/main/Dockerfile index 9d6cca9d7..237db9122 100644 --- a/linux/ecosystem/nginx/1.14.2/main/Dockerfile +++ b/linux/ecosystem/nginx/1.14.2/main/Dockerfile @@ -183,8 +183,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -230,8 +230,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.14.2/php/Dockerfile b/linux/ecosystem/nginx/1.14.2/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.14.2/php/Dockerfile +++ b/linux/ecosystem/nginx/1.14.2/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.14.2/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.14.2/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.14.2/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.15.12/main/Dockerfile b/linux/ecosystem/nginx/1.15.12/main/Dockerfile index 9d6cca9d7..237db9122 100644 --- a/linux/ecosystem/nginx/1.15.12/main/Dockerfile +++ b/linux/ecosystem/nginx/1.15.12/main/Dockerfile @@ -183,8 +183,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -230,8 +230,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.15.12/php/Dockerfile b/linux/ecosystem/nginx/1.15.12/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.15.12/php/Dockerfile +++ b/linux/ecosystem/nginx/1.15.12/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.15.12/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.15.12/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.15.12/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.16.1/main/Dockerfile b/linux/ecosystem/nginx/1.16.1/main/Dockerfile index 9d6cca9d7..237db9122 100644 --- a/linux/ecosystem/nginx/1.16.1/main/Dockerfile +++ b/linux/ecosystem/nginx/1.16.1/main/Dockerfile @@ -183,8 +183,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -230,8 +230,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.16.1/php/Dockerfile b/linux/ecosystem/nginx/1.16.1/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.16.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.16.1/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.16.1/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.16.1/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.16.1/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.17.10/main/Dockerfile b/linux/ecosystem/nginx/1.17.10/main/Dockerfile index 9d6cca9d7..237db9122 100644 --- a/linux/ecosystem/nginx/1.17.10/main/Dockerfile +++ b/linux/ecosystem/nginx/1.17.10/main/Dockerfile @@ -183,8 +183,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -230,8 +230,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.17.10/php/Dockerfile b/linux/ecosystem/nginx/1.17.10/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.17.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.17.10/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.17.10/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.17.10/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.17.10/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.18.0/main/Dockerfile b/linux/ecosystem/nginx/1.18.0/main/Dockerfile index 9d6cca9d7..237db9122 100644 --- a/linux/ecosystem/nginx/1.18.0/main/Dockerfile +++ b/linux/ecosystem/nginx/1.18.0/main/Dockerfile @@ -183,8 +183,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -230,8 +230,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.18.0/php/Dockerfile b/linux/ecosystem/nginx/1.18.0/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.18.0/php/Dockerfile +++ b/linux/ecosystem/nginx/1.18.0/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.18.0/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.18.0/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.18.0/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.19.10/main/Dockerfile b/linux/ecosystem/nginx/1.19.10/main/Dockerfile index 9d6cca9d7..237db9122 100644 --- a/linux/ecosystem/nginx/1.19.10/main/Dockerfile +++ b/linux/ecosystem/nginx/1.19.10/main/Dockerfile @@ -183,8 +183,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -230,8 +230,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.19.10/php/Dockerfile b/linux/ecosystem/nginx/1.19.10/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.19.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.19.10/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.19.10/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.19.10/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.19.10/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.20.1/main/Dockerfile b/linux/ecosystem/nginx/1.20.1/main/Dockerfile index 9d6cca9d7..237db9122 100644 --- a/linux/ecosystem/nginx/1.20.1/main/Dockerfile +++ b/linux/ecosystem/nginx/1.20.1/main/Dockerfile @@ -183,8 +183,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -230,8 +230,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.20.1/php/Dockerfile b/linux/ecosystem/nginx/1.20.1/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.20.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.20.1/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.20.1/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.20.1/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.20.1/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.21.3/main/Dockerfile b/linux/ecosystem/nginx/1.21.3/main/Dockerfile index 412451ac5..3e11b905c 100644 --- a/linux/ecosystem/nginx/1.21.3/main/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/main/Dockerfile @@ -182,8 +182,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -229,8 +229,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.21.3/php/Dockerfile b/linux/ecosystem/nginx/1.21.3/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.21.3/php/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/1.21.6/main/Dockerfile b/linux/ecosystem/nginx/1.21.6/main/Dockerfile index 412451ac5..3e11b905c 100644 --- a/linux/ecosystem/nginx/1.21.6/main/Dockerfile +++ b/linux/ecosystem/nginx/1.21.6/main/Dockerfile @@ -182,8 +182,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -229,8 +229,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.21.6/php/Dockerfile b/linux/ecosystem/nginx/1.21.6/php/Dockerfile index ee114f269..45ac0973a 100644 --- a/linux/ecosystem/nginx/1.21.6/php/Dockerfile +++ b/linux/ecosystem/nginx/1.21.6/php/Dockerfile @@ -241,8 +241,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile index ac86cc2ff..2a989cdcd 100644 --- a/linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile @@ -115,8 +115,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/latest/mainline/main/Dockerfile b/linux/ecosystem/nginx/latest/mainline/main/Dockerfile index 8f1a3b490..b654c9b8c 100644 --- a/linux/ecosystem/nginx/latest/mainline/main/Dockerfile +++ b/linux/ecosystem/nginx/latest/mainline/main/Dockerfile @@ -267,8 +267,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -315,8 +315,8 @@ RUN cp -rfv /tmp/nginx-pre/* / && \ ln -sfv /dev/stdout /var/log/nginx/access.log && \ ln -sfv /dev/stderr /var/log/nginx/error.log && \ ln -sfv /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile index 93d762dfa..b146c2e3a 100644 --- a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile @@ -352,8 +352,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/latest/mainline/rtmp-hls/Dockerfile index 175d32018..b13b92779 100644 --- a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/latest/mainline/rtmp-hls/Dockerfile @@ -111,8 +111,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/nginx/latest/quic/main/Dockerfile b/linux/ecosystem/nginx/latest/quic/main/Dockerfile index 6d97086ee..de76ed74e 100644 --- a/linux/ecosystem/nginx/latest/quic/main/Dockerfile +++ b/linux/ecosystem/nginx/latest/quic/main/Dockerfile @@ -204,8 +204,8 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-lua && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb @@ -251,8 +251,8 @@ RUN apt-get update && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/latest/quic/php/Dockerfile b/linux/ecosystem/nginx/latest/quic/php/Dockerfile index 09602a254..c694e49f4 100644 --- a/linux/ecosystem/nginx/latest/quic/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/quic/php/Dockerfile @@ -239,8 +239,8 @@ RUN cd /tmp && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/latest/quic/rtmp-hls/Dockerfile index 175d32018..b13b92779 100644 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/Dockerfile +++ b/linux/ecosystem/nginx/latest/quic/rtmp-hls/Dockerfile @@ -111,8 +111,8 @@ COPY players /usr/share/nginx/html/players ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/ninjam/latest/Dockerfile b/linux/ecosystem/ninjam/latest/Dockerfile index 14a0e9bdd..a62b97d98 100644 --- a/linux/ecosystem/ninjam/latest/Dockerfile +++ b/linux/ecosystem/ninjam/latest/Dockerfile @@ -36,9 +36,9 @@ COPY --from=builder /tmp/ninjam/ninjam/server/cclicense.txt ${NINJAM_BIN}/cclic ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/ecosystem/opentracker/Dockerfile b/linux/ecosystem/opentracker/Dockerfile index f9eed01c0..a56d38d71 100644 --- a/linux/ecosystem/opentracker/Dockerfile +++ b/linux/ecosystem/opentracker/Dockerfile @@ -45,8 +45,8 @@ COPY etc/opentracker/ ${APP_DIR} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /tmp/mc.patch && \ rm -rfv /var/cache/apt/archives/*.deb && \ diff --git a/linux/ecosystem/qbittorrent/5.0.3/Dockerfile b/linux/ecosystem/qbittorrent/5.0.3/Dockerfile new file mode 100644 index 000000000..59856eaa6 --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.3/Dockerfile @@ -0,0 +1,60 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV QBT_VERSION=5.0.3 +ENV QBT_LIBTORRENT_VERSION=2.0.11 +ENV QBT_URL=https://github.com/userdocs/qbittorrent-nox-static/releases/download/release-${QBT_VERSION}_v${QBT_LIBTORRENT_VERSION}/x86_64-qbittorrent-nox + +ENV QBT_DIR=/opt/qbittorrent +ENV QBT_PORT_WEBUI=8282 +ENV QBT_PORT_TRACKER=9000 +ENV QBT_PORT_NAT=1337 +ENV QBT_PROTOCOL=http + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${QBT_DIR} + +############################# #################################### +# qbittorrent install +################################################################## +RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${QBT_URL} -O /usr/bin/qbittorrent-nox && \ + chmod +x /usr/bin/qbittorrent-nox && \ + qbittorrent-nox --version + +################################################################## +# other customisations +################################################################## + +################################################################## +# cleaninig up +################################################################## +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 /root/tmp/* && \ + rm -rfv /tmp/* + +VOLUME ${QBT_DIR} + +#healthcheck. good practice +HEALTHCHECK --interval=2m --timeout=3s CMD curl --insecure -f ${QBT_PROTOCOL}://localhost:${QBT_PORT_WEBUI}/ || exit 1 + +# Add image configuration and scripts +COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh +RUN chmod 755 /usr/bin/docker-entrypoint.sh + +RUN updatedb + +#Final config +EXPOSE ${QBT_PORT_WEBUI} ${QBT_PORT_WEBUI}/udp ${QBT_PORT_NAT} ${QBT_PORT_NAT}/udp ${QBT_PORT_TRACKER} ${QBT_PORT_TRACKER}/udp + +ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"] +CMD ["docker-entrypoint.sh"] diff --git a/linux/ecosystem/qbittorrent/5.0.3/Dockerfile.libtorrent1 b/linux/ecosystem/qbittorrent/5.0.3/Dockerfile.libtorrent1 new file mode 100644 index 000000000..7c4b6d2ec --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.3/Dockerfile.libtorrent1 @@ -0,0 +1,60 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV QBT_VERSION=5.0.3 +ENV QBT_LIBTORRENT_VERSION=1.2.20 +ENV QBT_URL=https://github.com/userdocs/qbittorrent-nox-static/releases/download/release-${QBT_VERSION}_v${QBT_LIBTORRENT_VERSION}/x86_64-qbittorrent-nox + +ENV QBT_DIR=/opt/qbittorrent +ENV QBT_PORT_WEBUI=8282 +ENV QBT_PORT_TRACKER=9000 +ENV QBT_PORT_NAT=1337 +ENV QBT_PROTOCOL=http + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${QBT_DIR} + +############################# #################################### +# qbittorrent install +################################################################## +RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${QBT_URL} -O /usr/bin/qbittorrent-nox && \ + chmod +x /usr/bin/qbittorrent-nox && \ + qbittorrent-nox --version + +################################################################## +# other customisations +################################################################## + +################################################################## +# cleaninig up +################################################################## +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 /root/tmp/* && \ + rm -rfv /tmp/* + +VOLUME ${QBT_DIR} + +#healthcheck. good practice +HEALTHCHECK --interval=2m --timeout=3s CMD curl --insecure -f ${QBT_PROTOCOL}://localhost:${QBT_PORT_WEBUI}/ || exit 1 + +# Add image configuration and scripts +COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh +RUN chmod 755 /usr/bin/docker-entrypoint.sh + +RUN updatedb + +#Final config +EXPOSE ${QBT_PORT_WEBUI} ${QBT_PORT_WEBUI}/udp ${QBT_PORT_NAT} ${QBT_PORT_NAT}/udp ${QBT_PORT_TRACKER} ${QBT_PORT_TRACKER}/udp + +ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"] +CMD ["docker-entrypoint.sh"] diff --git a/linux/obsolete/gitlab/runner/php8.1/Makefile b/linux/ecosystem/qbittorrent/5.0.3/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/php8.1/Makefile rename to linux/ecosystem/qbittorrent/5.0.3/Makefile diff --git a/linux/ecosystem/qbittorrent/5.0.3/README.md b/linux/ecosystem/qbittorrent/5.0.3/README.md new file mode 100644 index 000000000..b2725f3cd --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.3/README.md @@ -0,0 +1,78 @@ +## Build info + +The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library. + +[![qbittorrent](https://github.com/EpicMorg/docker-scripts/raw/master/qbittorrent/qbittorrent-icon.png)](https://www.qbittorrent.org/) + + +All presented images avalible on our repo in docker hub. + +* qbittorrent `latest`, `stable` and `unstable` images are also avalible here. + +### Environments + +````` +QBT_PROFILES_DIR=/opt/qbittorrent/profiles +QBT_PROFILE_NAME=docker +QBT_PORT_WEBUI=8282 +QBT_PORT_NAT=1337 +QBT_PORT_TRACKER=9000 +````` + +### Exampe + +``` yamlservices: + qbittorrent: + image: epicmorg/qbittorrent:latest + container_name: qbittorrent + hostname: qbittorrent + restart: always + ports: + - "8282:8282" + - "1337:1337/udp" + - "1337:1337/tcp" + - "9000:9000/udp" + - "9000:9000/tcp" + cap_add: + - ALL + volumes: + - /etc/letsencrypt:/etc/letsencrypt + - /opt/docker/data/qbt/profiles:/opt/qbittorrent/profiles + environment: + - QBT_PROFILE_NAME=docker + - QBT_PORT_WEBUI=8282 + - QBT_PORT_NAT=1337 + - QBT_PORT_TRACKER=9000 + tmpfs: + - /tmp +``` + + +### Ngnix + +``` +server { + + listen 443 ssl http2; + + server_name torrent.domain.tld; + + ssl_certificate /etc/ssl/torrent.domain.tld.fullchain.crt; + ssl_certificate_key /etc/ssl/torrent.domain.tld.key; + + location / { + + proxy_pass http://qbittorrent:8282; + proxy_http_version 1.1; + + proxy_set_header Host 127.0.0.1:8282; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_cookie_path / "/; Secure"; + + client_max_body_size 0; + + } +} + +``` diff --git a/linux/ecosystem/qbittorrent/5.0.3/docker-compose.example.yml b/linux/ecosystem/qbittorrent/5.0.3/docker-compose.example.yml new file mode 100644 index 000000000..8be77e17d --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.3/docker-compose.example.yml @@ -0,0 +1,17 @@ +services: + qbittorrent: + image: epicmorg/qbittorrent:latest + restart: always + container_name: qbittorrent + ports: + - "0.0.0.0:8282:8282" + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone + - /etc/letsencrypt:/etc/letsencrypt + - /opt/qbittorrent/profiles:/opt/qbittorrent/profiles + tmpfs: + - /tmp + environment: + - QBT_PROFILE_NAME=docker + diff --git a/linux/ecosystem/qbittorrent/5.0.3/docker-compose.yml b/linux/ecosystem/qbittorrent/5.0.3/docker-compose.yml new file mode 100644 index 000000000..441cea847 --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.3/docker-compose.yml @@ -0,0 +1,14 @@ +services: + qbt: + image: "hub.epicm.org/epicmorg/qbittorrent:5.0.3" + build: + context: . + qbt-libtorrent2: + image: "hub.epicm.org/epicmorg/qbittorrent:5.0.3-libtorrent2.0.11" + build: + context: . + qbt-libtorrent1: + image: "hub.epicm.org/epicmorg/qbittorrent:5.0.3-libtorrent1.2.20" + build: + context: . + dockerfile: ./Dockerfile.libtorrent1 diff --git a/linux/ecosystem/qbittorrent/5.0.3/docker-entrypoint.sh b/linux/ecosystem/qbittorrent/5.0.3/docker-entrypoint.sh new file mode 100755 index 000000000..d916b0e86 --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.3/docker-entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +: ${QBT_DIR:=/opt/qbittorrent} +: ${QBT_PROFILES_DIR:=/opt/qbittorrent/profiles} +: ${QBT_PROFILE_NAME:=docker} +: ${QBT_PORT_WEBUI:=8282} +: ${QBT_PORT_NAT:=1337} +: ${QBT_PORT_TRACKER:=9000} + +echo "======================================================" +echo "[qbittorrent] Starting `qbittorrent-nox -v`..." +echo "======================================================" + +tail -n 512 -f ${QBT_PROFILES_DIR}/qBittorrent_${QBT_PROFILE_NAME}/data/logs/* & +exec qbittorrent-nox --profile=${QBT_PROFILES_DIR} --configuration=${QBT_PROFILE_NAME} --webui-port=${QBT_PORT_WEBUI} diff --git a/linux/ecosystem/qbittorrent/5.0.3/qbittorrent-icon.png b/linux/ecosystem/qbittorrent/5.0.3/qbittorrent-icon.png new file mode 100644 index 000000000..77d06fd31 Binary files /dev/null and b/linux/ecosystem/qbittorrent/5.0.3/qbittorrent-icon.png differ diff --git a/linux/ecosystem/qbittorrent/5.0.4/Dockerfile b/linux/ecosystem/qbittorrent/5.0.4/Dockerfile new file mode 100644 index 000000000..913a03782 --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.4/Dockerfile @@ -0,0 +1,60 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV QBT_VERSION=5.0.4 +ENV QBT_LIBTORRENT_VERSION=2.0.11 +ENV QBT_URL=https://github.com/userdocs/qbittorrent-nox-static/releases/download/release-${QBT_VERSION}_v${QBT_LIBTORRENT_VERSION}/x86_64-qbittorrent-nox + +ENV QBT_DIR=/opt/qbittorrent +ENV QBT_PORT_WEBUI=8282 +ENV QBT_PORT_TRACKER=9000 +ENV QBT_PORT_NAT=1337 +ENV QBT_PROTOCOL=http + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${QBT_DIR} + +############################# #################################### +# qbittorrent install +################################################################## +RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${QBT_URL} -O /usr/bin/qbittorrent-nox && \ + chmod +x /usr/bin/qbittorrent-nox && \ + qbittorrent-nox --version + +################################################################## +# other customisations +################################################################## + +################################################################## +# cleaninig up +################################################################## +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 /root/tmp/* && \ + rm -rfv /tmp/* + +VOLUME ${QBT_DIR} + +#healthcheck. good practice +HEALTHCHECK --interval=2m --timeout=3s CMD curl --insecure -f ${QBT_PROTOCOL}://localhost:${QBT_PORT_WEBUI}/ || exit 1 + +# Add image configuration and scripts +COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh +RUN chmod 755 /usr/bin/docker-entrypoint.sh + +RUN updatedb + +#Final config +EXPOSE ${QBT_PORT_WEBUI} ${QBT_PORT_WEBUI}/udp ${QBT_PORT_NAT} ${QBT_PORT_NAT}/udp ${QBT_PORT_TRACKER} ${QBT_PORT_TRACKER}/udp + +ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"] +CMD ["docker-entrypoint.sh"] diff --git a/linux/ecosystem/qbittorrent/5.0.4/Dockerfile.libtorrent1 b/linux/ecosystem/qbittorrent/5.0.4/Dockerfile.libtorrent1 new file mode 100644 index 000000000..eb18de92e --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.4/Dockerfile.libtorrent1 @@ -0,0 +1,60 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV QBT_VERSION=5.0.4 +ENV QBT_LIBTORRENT_VERSION=1.2.20 +ENV QBT_URL=https://github.com/userdocs/qbittorrent-nox-static/releases/download/release-${QBT_VERSION}_v${QBT_LIBTORRENT_VERSION}/x86_64-qbittorrent-nox + +ENV QBT_DIR=/opt/qbittorrent +ENV QBT_PORT_WEBUI=8282 +ENV QBT_PORT_TRACKER=9000 +ENV QBT_PORT_NAT=1337 +ENV QBT_PROTOCOL=http + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${QBT_DIR} + +############################# #################################### +# qbittorrent install +################################################################## +RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${QBT_URL} -O /usr/bin/qbittorrent-nox && \ + chmod +x /usr/bin/qbittorrent-nox && \ + qbittorrent-nox --version + +################################################################## +# other customisations +################################################################## + +################################################################## +# cleaninig up +################################################################## +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 /root/tmp/* && \ + rm -rfv /tmp/* + +VOLUME ${QBT_DIR} + +#healthcheck. good practice +HEALTHCHECK --interval=2m --timeout=3s CMD curl --insecure -f ${QBT_PROTOCOL}://localhost:${QBT_PORT_WEBUI}/ || exit 1 + +# Add image configuration and scripts +COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh +RUN chmod 755 /usr/bin/docker-entrypoint.sh + +RUN updatedb + +#Final config +EXPOSE ${QBT_PORT_WEBUI} ${QBT_PORT_WEBUI}/udp ${QBT_PORT_NAT} ${QBT_PORT_NAT}/udp ${QBT_PORT_TRACKER} ${QBT_PORT_TRACKER}/udp + +ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"] +CMD ["docker-entrypoint.sh"] diff --git a/linux/obsolete/gitlab/runner/php8.2/Makefile b/linux/ecosystem/qbittorrent/5.0.4/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/php8.2/Makefile rename to linux/ecosystem/qbittorrent/5.0.4/Makefile diff --git a/linux/ecosystem/qbittorrent/5.0.4/README.md b/linux/ecosystem/qbittorrent/5.0.4/README.md new file mode 100644 index 000000000..b2725f3cd --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.4/README.md @@ -0,0 +1,78 @@ +## Build info + +The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library. + +[![qbittorrent](https://github.com/EpicMorg/docker-scripts/raw/master/qbittorrent/qbittorrent-icon.png)](https://www.qbittorrent.org/) + + +All presented images avalible on our repo in docker hub. + +* qbittorrent `latest`, `stable` and `unstable` images are also avalible here. + +### Environments + +````` +QBT_PROFILES_DIR=/opt/qbittorrent/profiles +QBT_PROFILE_NAME=docker +QBT_PORT_WEBUI=8282 +QBT_PORT_NAT=1337 +QBT_PORT_TRACKER=9000 +````` + +### Exampe + +``` yamlservices: + qbittorrent: + image: epicmorg/qbittorrent:latest + container_name: qbittorrent + hostname: qbittorrent + restart: always + ports: + - "8282:8282" + - "1337:1337/udp" + - "1337:1337/tcp" + - "9000:9000/udp" + - "9000:9000/tcp" + cap_add: + - ALL + volumes: + - /etc/letsencrypt:/etc/letsencrypt + - /opt/docker/data/qbt/profiles:/opt/qbittorrent/profiles + environment: + - QBT_PROFILE_NAME=docker + - QBT_PORT_WEBUI=8282 + - QBT_PORT_NAT=1337 + - QBT_PORT_TRACKER=9000 + tmpfs: + - /tmp +``` + + +### Ngnix + +``` +server { + + listen 443 ssl http2; + + server_name torrent.domain.tld; + + ssl_certificate /etc/ssl/torrent.domain.tld.fullchain.crt; + ssl_certificate_key /etc/ssl/torrent.domain.tld.key; + + location / { + + proxy_pass http://qbittorrent:8282; + proxy_http_version 1.1; + + proxy_set_header Host 127.0.0.1:8282; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_cookie_path / "/; Secure"; + + client_max_body_size 0; + + } +} + +``` diff --git a/linux/ecosystem/qbittorrent/5.0.4/docker-compose.example.yml b/linux/ecosystem/qbittorrent/5.0.4/docker-compose.example.yml new file mode 100644 index 000000000..8be77e17d --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.4/docker-compose.example.yml @@ -0,0 +1,17 @@ +services: + qbittorrent: + image: epicmorg/qbittorrent:latest + restart: always + container_name: qbittorrent + ports: + - "0.0.0.0:8282:8282" + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone + - /etc/letsencrypt:/etc/letsencrypt + - /opt/qbittorrent/profiles:/opt/qbittorrent/profiles + tmpfs: + - /tmp + environment: + - QBT_PROFILE_NAME=docker + diff --git a/linux/ecosystem/qbittorrent/5.0.4/docker-compose.yml b/linux/ecosystem/qbittorrent/5.0.4/docker-compose.yml new file mode 100644 index 000000000..8478e7892 --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.4/docker-compose.yml @@ -0,0 +1,14 @@ +services: + qbt: + image: "hub.epicm.org/epicmorg/qbittorrent:5.0.4" + build: + context: . + qbt-libtorrent2: + image: "hub.epicm.org/epicmorg/qbittorrent:5.0.4-libtorrent2.0.11" + build: + context: . + qbt-libtorrent1: + image: "hub.epicm.org/epicmorg/qbittorrent:5.0.4-libtorrent1.2.20" + build: + context: . + dockerfile: ./Dockerfile.libtorrent1 diff --git a/linux/ecosystem/qbittorrent/5.0.4/docker-entrypoint.sh b/linux/ecosystem/qbittorrent/5.0.4/docker-entrypoint.sh new file mode 100755 index 000000000..d916b0e86 --- /dev/null +++ b/linux/ecosystem/qbittorrent/5.0.4/docker-entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +: ${QBT_DIR:=/opt/qbittorrent} +: ${QBT_PROFILES_DIR:=/opt/qbittorrent/profiles} +: ${QBT_PROFILE_NAME:=docker} +: ${QBT_PORT_WEBUI:=8282} +: ${QBT_PORT_NAT:=1337} +: ${QBT_PORT_TRACKER:=9000} + +echo "======================================================" +echo "[qbittorrent] Starting `qbittorrent-nox -v`..." +echo "======================================================" + +tail -n 512 -f ${QBT_PROFILES_DIR}/qBittorrent_${QBT_PROFILE_NAME}/data/logs/* & +exec qbittorrent-nox --profile=${QBT_PROFILES_DIR} --configuration=${QBT_PROFILE_NAME} --webui-port=${QBT_PORT_WEBUI} diff --git a/linux/ecosystem/qbittorrent/5.0.4/qbittorrent-icon.png b/linux/ecosystem/qbittorrent/5.0.4/qbittorrent-icon.png new file mode 100644 index 000000000..77d06fd31 Binary files /dev/null and b/linux/ecosystem/qbittorrent/5.0.4/qbittorrent-icon.png differ diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.10/Dockerfile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Dockerfile similarity index 67% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.10/Dockerfile rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Dockerfile index 8844d569a..7eec05d52 100644 --- a/linux/obsolete/teamcity/agent/amxx-sdk/1.10/Dockerfile +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Dockerfile @@ -16,35 +16,38 @@ ARG DEBIAN_FRONTEND=noninteractive # # Install packages ENV AMXX_VERSION=1.10 -ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION -ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting -ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include -ENV PATH=$PATH:$AMXX_BIN_PATH -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} COPY inc.tar /tmp RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \ - mkdir -p $AMXX_INSTALL_PATH && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ - mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ - chmod +x $AMXX_BIN_PATH/amxxpc && \ - chmod +x $AMXX_BIN_PATH/compile.sh && \ - tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ - chown -R buildagent:buildagent $AMXX_INC_PATH && \ - chmod -R 700 $AMXX_INC_PATH && \ + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chmod -R 700 ${AMXX_INC_PATH} && \ amxxpc --help 2>&1 | head -n 1 ################################################################## -# 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 /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/gitlab/runner/php8.3/Makefile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Makefile similarity index 100% rename from linux/obsolete/gitlab/runner/php8.3/Makefile rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Makefile diff --git a/linux/obsolete/gitlab/runner/node10/README.md b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node10/README.md rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.10/README.md diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.10/docker-compose.yml b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.10/docker-compose.yml rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.10/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/inc.tar b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/inc.tar new file mode 100644 index 000000000..533c3a1b5 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/inc.tar differ diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.9/Dockerfile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Dockerfile similarity index 67% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.9/Dockerfile rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Dockerfile index 4266db217..67facea42 100644 --- a/linux/obsolete/teamcity/agent/amxx-sdk/1.9/Dockerfile +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Dockerfile @@ -16,35 +16,38 @@ ARG DEBIAN_FRONTEND=noninteractive # # Install packages ENV AMXX_VERSION=1.9 -ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION -ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting -ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include -ENV PATH=$PATH:$AMXX_BIN_PATH -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH +ENV AMXX_INSTALL_PATH=${EMG_LOCAL_BASE_DIR}/amxmodx/${AMXX_VERSION} +ENV AMXX_BIN_PATH=${AMXX_INSTALL_PATH}/scripting +ENV AMXX_INC_PATH=${AMXX_BIN_PATH}/include +ENV PATH=${AMXX_BIN_PATH}:${PATH} +ENV LD_LIBRARY_PATH=${AMXX_BIN_PATH}:${LD_LIBRARY_PATH} COPY inc.tar /tmp RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \ - mkdir -p $AMXX_INSTALL_PATH && \ + mkdir -p ${AMXX_INSTALL_PATH} && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \ - mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ - chmod +x $AMXX_BIN_PATH/amxxpc && \ - chmod +x $AMXX_BIN_PATH/compile.sh && \ - tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ - chown -R buildagent:buildagent $AMXX_INC_PATH && \ - chmod -R 700 $AMXX_INC_PATH && \ + mv -f /tmp/addons/amxmodx/* ${AMXX_INSTALL_PATH} && \ + chmod +x ${AMXX_BIN_PATH}/amxxpc && \ + chmod +x ${AMXX_BIN_PATH}/compile.sh && \ + tar -C ${AMXX_INC_PATH} -xvf /tmp/inc.tar && \ + chmod -R 700 ${AMXX_INC_PATH} && \ amxxpc --help 2>&1 | head -n 1 ################################################################## -# 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 /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.10/Makefile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.10/Makefile rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Makefile diff --git a/linux/obsolete/gitlab/runner/node11/README.md b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node11/README.md rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.9/README.md diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.9/docker-compose.yml b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.9/docker-compose.yml rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.9/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/inc.tar b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/inc.tar new file mode 100644 index 000000000..533c3a1b5 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/inc.tar differ diff --git a/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile new file mode 100644 index 000000000..8253a69a5 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile @@ -0,0 +1,99 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ARG K_JDK_MAJOR_VERSION=17 +ARG K_JDK_FULL_VERSION=jdk-17.0.13 +ARG K_JDK_VERSION=17.0.13 +ARG K_JDK_BUILD_VERSION=11 +ARG K_JDK_DIR=${EMG_LOCAL_BASE_DIR}/java/${K_JDK_MAJOR_VERSION} +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 JAVA_HOME=${K_JDK_DIR} +ENV JRE_HOME=${JAVA_HOME} +ENV JDK_HOME=${JAVA_HOME} +ENV PATH=$PATH:${JAVA_HOME}/bin + +################################################################## +# installing java17 +################################################################## +ADD ${K_JDK_URL} /tmp +RUN mkdir -p ${K_JDK_DIR} && \ + tar -xvzf ${K_JDK_TEMP} --strip-components=1 --directory ${K_JDK_DIR} && \ + ln -sfv ${JAVA_HOME} /usr/jre && \ + ln -sfv ${JAVA_HOME} /usr/jdk && \ + java -version && \ +# cleanup + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +################################################################## +# Android SDK +################################################################## +ENV ANDROID_HOME=${EMG_LOCAL_BASE_DIR}/android/sdk +ENV ANDROID_SDK_ROOT=${ANDROID_HOME} + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + android-sdk \ + sdkmanager \ + android-sdk-build-tools \ + android-sdk-platform-tools-common \ + android-sdk-platform-tools \ + adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ + mkdir -p ${ANDROID_HOME} && \ + sdkmanager --version && \ + gradle -v && \ + mvn -v + +RUN sdkmanager --install --verbose \ + "cmake;3.22.1" \ +# + "cmdline-tools;latest" \ +# + "tools" \ +# + "platform-tools" \ +# + "platforms;android-21" \ + "platforms;android-34" \ + "platforms;android-35" \ +# + "build-tools;21.1.2" \ + "build-tools;34.0.0" \ + "build-tools;35.0.0" \ +# + "extras;android;m2repository" \ +# + "ndk;25.1.8937393" \ + "ndk;25.2.9519653" + +ENV PATH="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/tools/proguard/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH}" + +# Activate android sdk +RUN yes | sdkmanager --licenses && \ + flutter doctor && \ + yes | sdkmanager --licenses && \ + flutter doctor -v + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.9/Makefile b/linux/ecosystem/teamcity/agent/android-sdk/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.9/Makefile rename to linux/ecosystem/teamcity/agent/android-sdk/Makefile diff --git a/linux/obsolete/gitlab/runner/node12/README.md b/linux/ecosystem/teamcity/agent/android-sdk/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node12/README.md rename to linux/ecosystem/teamcity/agent/android-sdk/README.md diff --git a/linux/ecosystem/teamcity/agent/android-sdk/docker-compose.yml b/linux/ecosystem/teamcity/agent/android-sdk/docker-compose.yml new file mode 100644 index 000000000..c0dc25500 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/android-sdk/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/teamcity-agent:android-sdk" + build: + context: . diff --git a/linux/ecosystem/teamcity/agent/atlassian-sdk/Dockerfile b/linux/ecosystem/teamcity/agent/atlassian-sdk/Dockerfile new file mode 100644 index 000000000..ec4e72a37 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/atlassian-sdk/Dockerfile @@ -0,0 +1,51 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:latest +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# Atlassian SDK Setup +################################################################## + +ENV ATLASSIAN_SDK_DIR=${EMG_LOCAL_BASE_DIR}/atlassian +ENV ATLASSIAN_SDK_BIN_DIR=${ATLASSIAN_SDK_DIR}/bin +ENV ATLASSIAN_SDK_TEMP=/tmp/atlassian-plugin-sdk.tgz + +############################### +# https://community.atlassian.com/t5/Continuous-Delivery-questions/The-repository-https-packages-atlassian-com-atlassian-sdk-deb/qaq-p/1334014 +# +# https://community.developer.atlassian.com/t/the-repository-https-packages-atlassian-com-atlassian-sdk-deb-stable-release-is-not-signed/36901 +############################### +#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 +#Install packages +#RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contrib/a/atlassian-plugin-sdk/atlassian-plugin-sdk_8.0.16_all.deb -o /tmp/atlassian-plugin-sdk.deb && \ +# dpkg -i /tmp/atlassian-plugin-sdk.deb + +RUN mkdir -p ${ATLASSIAN_SDK_BIN_DIR} && \ + wget -O ${ATLASSIAN_SDK_TEMP} "https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz" && \ + tar -xvzf /tmp/atlassian-plugin-sdk.tgz --strip-components=1 --directory ${ATLASSIAN_SDK_DIR} + +ENV PATH=$PATH:${ATLASSIAN_SDK_BIN_DIR} + +################################################################## +# Version after install +################################################################## +RUN echo "=============================================" && \ + atlas-version && \ + echo "=============================================" + +################################################################## +# cleaninig up +################################################################## +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk11/Makefile b/linux/ecosystem/teamcity/agent/atlassian-sdk/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/android-sdk/jdk11/Makefile rename to linux/ecosystem/teamcity/agent/atlassian-sdk/Makefile diff --git a/linux/obsolete/gitlab/runner/node13/README.md b/linux/ecosystem/teamcity/agent/atlassian-sdk/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node13/README.md rename to linux/ecosystem/teamcity/agent/atlassian-sdk/README.md diff --git a/linux/obsolete/teamcity/agent/atlassian-sdk/docker-compose.yml b/linux/ecosystem/teamcity/agent/atlassian-sdk/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/atlassian-sdk/docker-compose.yml rename to linux/ecosystem/teamcity/agent/atlassian-sdk/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/latest/Dockerfile b/linux/ecosystem/teamcity/agent/latest/Dockerfile index 0437de095..9e311e6df 100644 --- a/linux/ecosystem/teamcity/agent/latest/Dockerfile +++ b/linux/ecosystem/teamcity/agent/latest/Dockerfile @@ -38,9 +38,9 @@ RUN install -m 0755 -d /etc/apt/keyrings && \ curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ chmod +x /usr/local/bin/docker-compose && \ # cleanup - apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* @@ -55,6 +55,54 @@ ENV PODMAN_HOST="unix:///var/run/docker.sock" COPY etc/ /etc/ +################################################################## +# installing dotnet +################################################################## +ENV DOTNET_CHANNEL=STS +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 + +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 +################################################################## +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ +# echo "deb https://download.mono-project.com/repo/debian stable-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ +# echo "deb https://download.mono-project.com/repo/debian nightly-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ + echo "deb https://download.mono-project.com/repo/debian preview-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated \ + mono-complete \ + mono-llvm-support \ + mono-devel \ + mono-dbg \ + referenceassemblies-pcl \ + ca-certificates-mono \ + mono-xsp4 + ################################################################## # Cleanup ################################################################## diff --git a/linux/ecosystem/teamcity/agent/minimal/etc/supervisor/conf.d/teamcity-agent.conf b/linux/ecosystem/teamcity/agent/minimal/etc/supervisor/conf.d/teamcity-agent.conf index 94e328311..cf010502c 100644 --- a/linux/ecosystem/teamcity/agent/minimal/etc/supervisor/conf.d/teamcity-agent.conf +++ b/linux/ecosystem/teamcity/agent/minimal/etc/supervisor/conf.d/teamcity-agent.conf @@ -1,5 +1,6 @@ [program:teamcity-agent] command=/usr/local/share/epicmorg/teamcity/agent/sbin/entrypoint.sh +environment=JAVA_HOME="/usr/local/share/epicmorg/java/21",JRE_HOME="/usr/local/share/epicmorg/java/21",JDK_HOME="/usr/local/share/epicmorg/java/21" autostart=true autorestart=true killasgroup=true diff --git a/linux/obsolete/teamcity/agent/node0.12/Dockerfile b/linux/ecosystem/teamcity/agent/node0.12/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node0.12/Dockerfile rename to linux/ecosystem/teamcity/agent/node0.12/Dockerfile diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk17/Makefile b/linux/ecosystem/teamcity/agent/node0.12/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/android-sdk/jdk17/Makefile rename to linux/ecosystem/teamcity/agent/node0.12/Makefile diff --git a/linux/obsolete/gitlab/runner/node14/README.md b/linux/ecosystem/teamcity/agent/node0.12/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node14/README.md rename to linux/ecosystem/teamcity/agent/node0.12/README.md diff --git a/linux/obsolete/teamcity/agent/node0.12/docker-compose.yml b/linux/ecosystem/teamcity/agent/node0.12/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node0.12/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node0.12/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node10/Dockerfile b/linux/ecosystem/teamcity/agent/node10/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node10/Dockerfile rename to linux/ecosystem/teamcity/agent/node10/Dockerfile diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk8/Makefile b/linux/ecosystem/teamcity/agent/node10/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/android-sdk/jdk8/Makefile rename to linux/ecosystem/teamcity/agent/node10/Makefile diff --git a/linux/obsolete/gitlab/runner/node15/README.md b/linux/ecosystem/teamcity/agent/node10/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node15/README.md rename to linux/ecosystem/teamcity/agent/node10/README.md diff --git a/linux/obsolete/teamcity/agent/node10/docker-compose.yml b/linux/ecosystem/teamcity/agent/node10/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node10/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node10/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node11/Dockerfile b/linux/ecosystem/teamcity/agent/node11/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node11/Dockerfile rename to linux/ecosystem/teamcity/agent/node11/Dockerfile diff --git a/linux/obsolete/teamcity/agent/atlassian-sdk/Makefile b/linux/ecosystem/teamcity/agent/node11/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/atlassian-sdk/Makefile rename to linux/ecosystem/teamcity/agent/node11/Makefile diff --git a/linux/obsolete/gitlab/runner/node16/README.md b/linux/ecosystem/teamcity/agent/node11/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node16/README.md rename to linux/ecosystem/teamcity/agent/node11/README.md diff --git a/linux/obsolete/teamcity/agent/node11/docker-compose.yml b/linux/ecosystem/teamcity/agent/node11/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node11/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node11/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node12/Dockerfile b/linux/ecosystem/teamcity/agent/node12/Dockerfile similarity index 88% rename from linux/obsolete/teamcity/agent/node12/Dockerfile rename to linux/ecosystem/teamcity/agent/node12/Dockerfile index 0c1f4c24b..d600b2d87 100644 --- a/linux/obsolete/teamcity/agent/node12/Dockerfile +++ b/linux/ecosystem/teamcity/agent/node12/Dockerfile @@ -1,6 +1,5 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" - ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=12 @@ -41,7 +40,11 @@ RUN echo "clean up" && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/teamcity/agent/dotnet-sdk/Makefile b/linux/ecosystem/teamcity/agent/node12/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/dotnet-sdk/Makefile rename to linux/ecosystem/teamcity/agent/node12/Makefile diff --git a/linux/obsolete/gitlab/runner/node17/README.md b/linux/ecosystem/teamcity/agent/node12/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node17/README.md rename to linux/ecosystem/teamcity/agent/node12/README.md diff --git a/linux/obsolete/teamcity/agent/node12/docker-compose.yml b/linux/ecosystem/teamcity/agent/node12/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node12/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node12/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node13/Dockerfile b/linux/ecosystem/teamcity/agent/node13/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node13/Dockerfile rename to linux/ecosystem/teamcity/agent/node13/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node0.12/Makefile b/linux/ecosystem/teamcity/agent/node13/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node0.12/Makefile rename to linux/ecosystem/teamcity/agent/node13/Makefile diff --git a/linux/obsolete/gitlab/runner/node18/README.md b/linux/ecosystem/teamcity/agent/node13/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node18/README.md rename to linux/ecosystem/teamcity/agent/node13/README.md diff --git a/linux/obsolete/teamcity/agent/node13/docker-compose.yml b/linux/ecosystem/teamcity/agent/node13/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node13/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node13/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node14/Dockerfile b/linux/ecosystem/teamcity/agent/node14/Dockerfile similarity index 88% rename from linux/obsolete/gitlab/runner/node14/Dockerfile rename to linux/ecosystem/teamcity/agent/node14/Dockerfile index 300a233a0..98b73e1f7 100644 --- a/linux/obsolete/gitlab/runner/node14/Dockerfile +++ b/linux/ecosystem/teamcity/agent/node14/Dockerfile @@ -1,6 +1,5 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" - ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=14 @@ -41,7 +40,11 @@ RUN echo "clean up" && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node10/Makefile b/linux/ecosystem/teamcity/agent/node14/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node10/Makefile rename to linux/ecosystem/teamcity/agent/node14/Makefile diff --git a/linux/obsolete/gitlab/runner/node19/README.md b/linux/ecosystem/teamcity/agent/node14/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node19/README.md rename to linux/ecosystem/teamcity/agent/node14/README.md diff --git a/linux/obsolete/teamcity/agent/node14/docker-compose.yml b/linux/ecosystem/teamcity/agent/node14/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node14/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node14/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node15/Dockerfile b/linux/ecosystem/teamcity/agent/node15/Dockerfile similarity index 88% rename from linux/obsolete/teamcity/agent/node15/Dockerfile rename to linux/ecosystem/teamcity/agent/node15/Dockerfile index 35a322c71..031924637 100644 --- a/linux/obsolete/teamcity/agent/node15/Dockerfile +++ b/linux/ecosystem/teamcity/agent/node15/Dockerfile @@ -1,6 +1,5 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" - ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=15 @@ -42,7 +41,11 @@ RUN echo "clean up" && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node11/Makefile b/linux/ecosystem/teamcity/agent/node15/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node11/Makefile rename to linux/ecosystem/teamcity/agent/node15/Makefile diff --git a/linux/obsolete/gitlab/runner/node20/README.md b/linux/ecosystem/teamcity/agent/node15/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node20/README.md rename to linux/ecosystem/teamcity/agent/node15/README.md diff --git a/linux/obsolete/teamcity/agent/node15/docker-compose.yml b/linux/ecosystem/teamcity/agent/node15/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node15/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node15/docker-compose.yml diff --git a/linux/obsolete/gitlab/runner/node16/Dockerfile b/linux/ecosystem/teamcity/agent/node16/Dockerfile similarity index 88% rename from linux/obsolete/gitlab/runner/node16/Dockerfile rename to linux/ecosystem/teamcity/agent/node16/Dockerfile index 3774a1a9d..7dcb0105e 100644 --- a/linux/obsolete/gitlab/runner/node16/Dockerfile +++ b/linux/ecosystem/teamcity/agent/node16/Dockerfile @@ -1,6 +1,5 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" - ARG DEBIAN_FRONTEND=noninteractive ARG K_NODE_MAJOR_VERSION=16 @@ -42,7 +41,11 @@ RUN echo "clean up" && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node12/Makefile b/linux/ecosystem/teamcity/agent/node16/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node12/Makefile rename to linux/ecosystem/teamcity/agent/node16/Makefile diff --git a/linux/obsolete/gitlab/runner/node21/README.md b/linux/ecosystem/teamcity/agent/node16/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node21/README.md rename to linux/ecosystem/teamcity/agent/node16/README.md diff --git a/linux/obsolete/teamcity/agent/node16/docker-compose.yml b/linux/ecosystem/teamcity/agent/node16/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node16/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node16/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node17/Dockerfile b/linux/ecosystem/teamcity/agent/node17/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node17/Dockerfile rename to linux/ecosystem/teamcity/agent/node17/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node13/Makefile b/linux/ecosystem/teamcity/agent/node17/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node13/Makefile rename to linux/ecosystem/teamcity/agent/node17/Makefile diff --git a/linux/obsolete/gitlab/runner/node22/README.md b/linux/ecosystem/teamcity/agent/node17/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node22/README.md rename to linux/ecosystem/teamcity/agent/node17/README.md diff --git a/linux/obsolete/teamcity/agent/node17/docker-compose.yml b/linux/ecosystem/teamcity/agent/node17/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node17/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node17/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node18/Dockerfile b/linux/ecosystem/teamcity/agent/node18/Dockerfile similarity index 86% rename from linux/obsolete/teamcity/agent/node18/Dockerfile rename to linux/ecosystem/teamcity/agent/node18/Dockerfile index 3fff3ebd9..2790c264e 100644 --- a/linux/obsolete/teamcity/agent/node18/Dockerfile +++ b/linux/ecosystem/teamcity/agent/node18/Dockerfile @@ -1,10 +1,9 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal 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.4 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.20.8 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 @@ -41,7 +40,11 @@ RUN echo "clean up" && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node14/Makefile b/linux/ecosystem/teamcity/agent/node18/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node14/Makefile rename to linux/ecosystem/teamcity/agent/node18/Makefile diff --git a/linux/obsolete/gitlab/runner/node4/README.md b/linux/ecosystem/teamcity/agent/node18/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node4/README.md rename to linux/ecosystem/teamcity/agent/node18/README.md diff --git a/linux/obsolete/teamcity/agent/node18/docker-compose.yml b/linux/ecosystem/teamcity/agent/node18/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node18/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node18/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node19/Dockerfile b/linux/ecosystem/teamcity/agent/node19/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node19/Dockerfile rename to linux/ecosystem/teamcity/agent/node19/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node15/Makefile b/linux/ecosystem/teamcity/agent/node19/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node15/Makefile rename to linux/ecosystem/teamcity/agent/node19/Makefile diff --git a/linux/obsolete/gitlab/runner/node5/README.md b/linux/ecosystem/teamcity/agent/node19/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node5/README.md rename to linux/ecosystem/teamcity/agent/node19/README.md diff --git a/linux/obsolete/teamcity/agent/node19/docker-compose.yml b/linux/ecosystem/teamcity/agent/node19/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node19/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node19/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node20/Dockerfile b/linux/ecosystem/teamcity/agent/node20/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node20/Dockerfile rename to linux/ecosystem/teamcity/agent/node20/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node16/Makefile b/linux/ecosystem/teamcity/agent/node20/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node16/Makefile rename to linux/ecosystem/teamcity/agent/node20/Makefile diff --git a/linux/obsolete/gitlab/runner/node6/README.md b/linux/ecosystem/teamcity/agent/node20/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node6/README.md rename to linux/ecosystem/teamcity/agent/node20/README.md diff --git a/linux/obsolete/teamcity/agent/node20/docker-compose.yml b/linux/ecosystem/teamcity/agent/node20/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node20/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node20/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node21/Dockerfile b/linux/ecosystem/teamcity/agent/node21/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node21/Dockerfile rename to linux/ecosystem/teamcity/agent/node21/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node17/Makefile b/linux/ecosystem/teamcity/agent/node21/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node17/Makefile rename to linux/ecosystem/teamcity/agent/node21/Makefile diff --git a/linux/obsolete/gitlab/runner/node7/README.md b/linux/ecosystem/teamcity/agent/node21/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node7/README.md rename to linux/ecosystem/teamcity/agent/node21/README.md diff --git a/linux/obsolete/teamcity/agent/node21/docker-compose.yml b/linux/ecosystem/teamcity/agent/node21/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node21/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node21/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node22/Dockerfile b/linux/ecosystem/teamcity/agent/node22/Dockerfile similarity index 86% rename from linux/obsolete/teamcity/agent/node22/Dockerfile rename to linux/ecosystem/teamcity/agent/node22/Dockerfile index 32dcdc632..6530227db 100644 --- a/linux/obsolete/teamcity/agent/node22/Dockerfile +++ b/linux/ecosystem/teamcity/agent/node22/Dockerfile @@ -1,10 +1,9 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal 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}.6.0 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.14.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 @@ -41,7 +40,11 @@ RUN echo "clean up" && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ rm -rfv /tmp/* +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node18/Makefile b/linux/ecosystem/teamcity/agent/node22/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node18/Makefile rename to linux/ecosystem/teamcity/agent/node22/Makefile diff --git a/linux/obsolete/gitlab/runner/node8/README.md b/linux/ecosystem/teamcity/agent/node22/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node8/README.md rename to linux/ecosystem/teamcity/agent/node22/README.md diff --git a/linux/obsolete/teamcity/agent/node22/docker-compose.yml b/linux/ecosystem/teamcity/agent/node22/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node22/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node22/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/node23/Dockerfile b/linux/ecosystem/teamcity/agent/node23/Dockerfile new file mode 100644 index 000000000..72b0cbbab --- /dev/null +++ b/linux/ecosystem/teamcity/agent/node23/Dockerfile @@ -0,0 +1,50 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ARG K_NODE_MAJOR_VERSION=23 +ARG K_NODE_VERSION=${K_NODE_MAJOR_VERSION}.11.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 + +################################################################## +# Node.js 23.x +################################################################## +RUN groupadd -g 1337 node && \ + useradd -u 1337 --gid node --shell /bin/bash --create-home node + +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 + +################################################################## +# Version after install +################################################################## +RUN echo "=============================================" && \ + echo node $(node --version) && \ + echo npm $(npm --version) && \ + echo yarn $(yarn --version) && \ + echo pnpm $(pnpm --version) && \ + echo "=============================================" + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/obsolete/teamcity/agent/node19/Makefile b/linux/ecosystem/teamcity/agent/node23/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node19/Makefile rename to linux/ecosystem/teamcity/agent/node23/Makefile diff --git a/linux/obsolete/gitlab/runner/node9/README.md b/linux/ecosystem/teamcity/agent/node23/README.md similarity index 100% rename from linux/obsolete/gitlab/runner/node9/README.md rename to linux/ecosystem/teamcity/agent/node23/README.md diff --git a/linux/ecosystem/teamcity/agent/node23/docker-compose.yml b/linux/ecosystem/teamcity/agent/node23/docker-compose.yml new file mode 100644 index 000000000..a4e94a708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/node23/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/teamcity-agent:node23" + build: + context: . diff --git a/linux/obsolete/teamcity/agent/node4/Dockerfile b/linux/ecosystem/teamcity/agent/node4/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node4/Dockerfile rename to linux/ecosystem/teamcity/agent/node4/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node20/Makefile b/linux/ecosystem/teamcity/agent/node4/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node20/Makefile rename to linux/ecosystem/teamcity/agent/node4/Makefile diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.10/README.md b/linux/ecosystem/teamcity/agent/node4/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.10/README.md rename to linux/ecosystem/teamcity/agent/node4/README.md diff --git a/linux/obsolete/teamcity/agent/node4/docker-compose.yml b/linux/ecosystem/teamcity/agent/node4/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node4/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node4/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node5/Dockerfile b/linux/ecosystem/teamcity/agent/node5/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node5/Dockerfile rename to linux/ecosystem/teamcity/agent/node5/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node21/Makefile b/linux/ecosystem/teamcity/agent/node5/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node21/Makefile rename to linux/ecosystem/teamcity/agent/node5/Makefile diff --git a/linux/obsolete/teamcity/agent/amxx-sdk/1.9/README.md b/linux/ecosystem/teamcity/agent/node5/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/amxx-sdk/1.9/README.md rename to linux/ecosystem/teamcity/agent/node5/README.md diff --git a/linux/obsolete/teamcity/agent/node5/docker-compose.yml b/linux/ecosystem/teamcity/agent/node5/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node5/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node5/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node6/Dockerfile b/linux/ecosystem/teamcity/agent/node6/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node6/Dockerfile rename to linux/ecosystem/teamcity/agent/node6/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node22/Makefile b/linux/ecosystem/teamcity/agent/node6/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node22/Makefile rename to linux/ecosystem/teamcity/agent/node6/Makefile diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk11/README.md b/linux/ecosystem/teamcity/agent/node6/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/android-sdk/jdk11/README.md rename to linux/ecosystem/teamcity/agent/node6/README.md diff --git a/linux/obsolete/teamcity/agent/node6/docker-compose.yml b/linux/ecosystem/teamcity/agent/node6/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node6/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node6/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node7/Dockerfile b/linux/ecosystem/teamcity/agent/node7/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node7/Dockerfile rename to linux/ecosystem/teamcity/agent/node7/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node4/Makefile b/linux/ecosystem/teamcity/agent/node7/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node4/Makefile rename to linux/ecosystem/teamcity/agent/node7/Makefile diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk17/README.md b/linux/ecosystem/teamcity/agent/node7/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/android-sdk/jdk17/README.md rename to linux/ecosystem/teamcity/agent/node7/README.md diff --git a/linux/obsolete/teamcity/agent/node7/docker-compose.yml b/linux/ecosystem/teamcity/agent/node7/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node7/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node7/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node8/Dockerfile b/linux/ecosystem/teamcity/agent/node8/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node8/Dockerfile rename to linux/ecosystem/teamcity/agent/node8/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node5/Makefile b/linux/ecosystem/teamcity/agent/node8/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node5/Makefile rename to linux/ecosystem/teamcity/agent/node8/Makefile diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk8/README.md b/linux/ecosystem/teamcity/agent/node8/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/android-sdk/jdk8/README.md rename to linux/ecosystem/teamcity/agent/node8/README.md diff --git a/linux/obsolete/teamcity/agent/node8/docker-compose.yml b/linux/ecosystem/teamcity/agent/node8/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node8/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node8/docker-compose.yml diff --git a/linux/obsolete/teamcity/agent/node9/Dockerfile b/linux/ecosystem/teamcity/agent/node9/Dockerfile similarity index 100% rename from linux/obsolete/teamcity/agent/node9/Dockerfile rename to linux/ecosystem/teamcity/agent/node9/Dockerfile diff --git a/linux/obsolete/teamcity/agent/node6/Makefile b/linux/ecosystem/teamcity/agent/node9/Makefile similarity index 100% rename from linux/obsolete/teamcity/agent/node6/Makefile rename to linux/ecosystem/teamcity/agent/node9/Makefile diff --git a/linux/obsolete/teamcity/agent/atlassian-sdk/README.md b/linux/ecosystem/teamcity/agent/node9/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/atlassian-sdk/README.md rename to linux/ecosystem/teamcity/agent/node9/README.md diff --git a/linux/obsolete/teamcity/agent/node9/docker-compose.yml b/linux/ecosystem/teamcity/agent/node9/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/node9/docker-compose.yml rename to linux/ecosystem/teamcity/agent/node9/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php56/Dockerfile b/linux/ecosystem/teamcity/agent/php56/Dockerfile new file mode 100644 index 000000000..2aadfa05c --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php56/Dockerfile @@ -0,0 +1,282 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=5.6 +ENV PHP_MODULE_PATH=/usr/lib/php/20131226 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP5.6 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ +# php-pear \ + php5.6 \ + php5.6-cli \ + php5.6-common \ + php5.6-dev \ + php5.6-amqp \ + php5.6-apcu \ + php5.6-bcmath \ + php5.6-bz2 \ + php5.6-cgi \ + php5.6-curl \ + php5.6-dba \ + php5.6-dio \ + php5.6-enchant \ + php5.6-fpm \ + php5.6-gd \ + php5.6-gearman \ + php5.6-geoip \ +# php5.6-gmagick \ + php5.6-gmp \ + php5.6-gnupg \ + php5.6-grpc \ + php5.6-http \ + php5.6-igbinary \ + php5.6-imagick \ + php5.6-imap \ + php5.6-inotify \ + php5.6-interbase \ + php5.6-intl \ + php5.6-json \ + php5.6-ldap \ + php5.6-libvirt-php \ + php5.6-lua \ + php5.6-lz4 \ + php5.6-mailparse \ + php5.6-mbstring \ + php5.6-mcrypt \ + php5.6-memcache \ + php5.6-memcached \ + php5.6-mongo \ + php5.6-mongodb \ + php5.6-msgpack \ + php5.6-mysql \ + php5.6-mysqlnd-ms \ + php5.6-oauth \ + php5.6-odbc \ + php5.6-opcache \ + php5.6-pgsql \ + php5.6-phpdbg \ + php5.6-propro \ + php5.6-protobuf \ + php5.6-ps \ + php5.6-pspell \ + php5.6-radius \ + php5.6-raphf \ + php5.6-readline \ + php5.6-recode \ + php5.6-redis \ + php5.6-rrd \ + php5.6-smbclient \ + php5.6-snmp \ + php5.6-soap \ + php5.6-solr \ + php5.6-sqlite3 \ + php5.6-ssh2 \ + php5.6-stomp \ + php5.6-sybase \ + php5.6-tidy \ + php5.6-uploadprogress \ +# php5.6-xcache \ + php5.6-xdebug \ + php5.6-xhprof \ + php5.6-xml \ + php5.6-xmlrpc \ + php5.6-xsl \ +# php5.6-yac \ + php5.6-yaml \ + php5.6-zip \ + php5.6-zmq \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ +# php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php5.6 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +################################################################## +# Enabling extensions +################################################################## +#RUN pear update-channels && \ +# pecl channel-update pecl.php.net && \ +# pear upgrade + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +#OPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +#RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +#RUN cd /tmp/cassandra-php-driver && \ +# dpkg -i ./multiarch-support_2.28_amd64.deb && \ +# dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ +# dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ +# dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +# echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > /usr/local/etc/php/conf.d/cassandra.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing imagic addon +################################################################## +#RUN pecl install imagick && \ +## echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/apache2/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_5.6.so ${PHP_MODULE_PATH} && \ + # echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.6.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.6.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_5.6.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +#COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +#RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +## ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php56/Makefile b/linux/ecosystem/teamcity/agent/php56/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php56/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/dotnet-sdk/README.md b/linux/ecosystem/teamcity/agent/php56/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/dotnet-sdk/README.md rename to linux/ecosystem/teamcity/agent/php56/README.md diff --git a/linux/ecosystem/teamcity/agent/php56/docker-compose.yml b/linux/ecosystem/teamcity/agent/php56/docker-compose.yml new file mode 100644 index 000000000..b5d30e81d --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php56/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/teamcity-agent:php5.6" + build: + context: . diff --git a/linux/ecosystem/teamcity/agent/php70/Dockerfile b/linux/ecosystem/teamcity/agent/php70/Dockerfile new file mode 100644 index 000000000..846921b2c --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php70/Dockerfile @@ -0,0 +1,386 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV BuildDocker true + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.0 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20151012 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +#installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.0 \ + php7.0-common \ + php7.0-dev \ + php7.0-fpm \ + php7.0-cli \ + php7.0-xml \ + php7.0-cgi && \ + update-alternatives --set php /usr/bin/php7.0 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=7.0 +ENV PHP_MODULE_PATH=/usr/lib/php/20151012 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +#installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.0 \ + php7.0-cli \ + php7.0-common \ + php7.0-dev \ + php7.0-amqp \ + php7.0-apcu-bc \ + php7.0-apcu \ + php7.0-bcmath \ + php7.0-bz2 \ + php7.0-cgi \ + php7.0-curl \ + php7.0-dba \ + php7.0-decimal \ + php7.0-dio \ + php7.0-ds \ + php7.0-enchant \ + php7.0-fpm \ + php7.0-gd \ + php7.0-gearman \ + php7.0-geoip \ +# php7.0-gmagick \ + php7.0-gmp \ + php7.0-gnupg \ + php7.0-grpc \ + php7.0-http \ + php7.0-igbinary \ + php7.0-imagick \ + php7.0-imap \ + php7.0-inotify \ + php7.0-interbase \ + php7.0-intl \ + php7.0-json \ + php7.0-ldap \ + php7.0-libvirt-php \ + php7.0-lua \ + php7.0-lz4 \ + php7.0-mailparse \ + php7.0-mbstring \ + php7.0-mcrypt \ + php7.0-memcache \ + php7.0-memcached \ + php7.0-mongodb \ + php7.0-msgpack \ + php7.0-mysql \ + php7.0-oauth \ + php7.0-odbc \ + php7.0-opcache \ + php7.0-pgsql \ + php7.0-phpdbg \ + php7.0-pinba \ +# php7.0-pq \ + php7.0-propro \ + php7.0-protobuf \ + php7.0-ps \ + php7.0-pspell \ + php7.0-radius \ + php7.0-raphf \ + php7.0-rdkafka \ + php7.0-readline \ + php7.0-recode \ + php7.0-redis \ + php7.0-rrd \ + php7.0-smbclient \ + php7.0-snmp \ + php7.0-soap \ + php7.0-sodium \ + php7.0-solr \ + php7.0-sqlite3 \ + php7.0-ssh2 \ + php7.0-stomp \ + php7.0-sybase \ + php7.0-tideways \ + php7.0-tidy \ + php7.0-uploadprogress \ + php7.0-uuid \ + php7.0-vips \ + php7.0-xdebug \ + php7.0-xhprof \ + php7.0-xml \ + php7.0-xmlrpc \ + php7.0-xsl \ +# php7.0-yac \ + php7.0-yaml \ + php7.0-zip \ + php7.0-zmq \ + php7.0-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ +# php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.0 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +RUN pecl install cassandra && \ + echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php70.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.0.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.0.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php70/Makefile b/linux/ecosystem/teamcity/agent/php70/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php70/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node0.12/README.md b/linux/ecosystem/teamcity/agent/php70/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node0.12/README.md rename to linux/ecosystem/teamcity/agent/php70/README.md diff --git a/linux/ecosystem/teamcity/agent/php70/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php70/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php70/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php70/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php70/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php70/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php70/docker-compose.yml b/linux/ecosystem/teamcity/agent/php70/docker-compose.yml new file mode 100644 index 000000000..ec7416c87 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php70/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/teamcity-agent:php7.0" + build: + context: . diff --git a/linux/ecosystem/teamcity/agent/php70/usr/lib/php/20151012/phpBolt-extension-1.0.4-php70.so b/linux/ecosystem/teamcity/agent/php70/usr/lib/php/20151012/phpBolt-extension-1.0.4-php70.so new file mode 100644 index 000000000..e6d3abfda Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php70/usr/lib/php/20151012/phpBolt-extension-1.0.4-php70.so differ diff --git a/linux/ecosystem/teamcity/agent/php70/usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so b/linux/ecosystem/teamcity/agent/php70/usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so new file mode 100644 index 000000000..e6d3abfda Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php70/usr/lib/php/20151012/phpBolt-extension-1.0.5-php70.so differ diff --git a/linux/ecosystem/teamcity/agent/php71/Dockerfile b/linux/ecosystem/teamcity/agent/php71/Dockerfile new file mode 100644 index 000000000..e09420952 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php71/Dockerfile @@ -0,0 +1,388 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV BuildDocker true + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.1 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20160303 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +#installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.1 \ + php7.1-common \ + php7.1-dev \ + php7.1-fpm \ + php7.1-cli \ + php7.1-xml \ + php7.1-cgi && \ + update-alternatives --set php /usr/bin/php7.1 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=7.1 +ENV PHP_MODULE_PATH=/usr/lib/php/20160303 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.1 \ + php7.1-cli \ + php7.1-common \ + php7.1-dev \ + php7.1-amqp \ + php7.1-apcu-bc \ + php7.1-apcu \ + php7.1-bcmath \ + php7.1-bz2 \ + php7.1-cgi \ + php7.1-curl \ + php7.1-dba \ + php7.1-decimal \ + php7.1-dio \ + php7.1-ds \ + php7.1-enchant \ + php7.1-excimer \ + php7.1-fpm \ + php7.1-gd \ + php7.1-gearman \ + php7.1-geoip \ +# php7.1-gmagick \ + php7.1-gmp \ + php7.1-gnupg \ + php7.1-grpc \ + php7.1-http \ + php7.1-igbinary \ + php7.1-imagick \ + php7.1-imap \ + php7.1-inotify \ + php7.1-interbase \ + php7.1-intl \ + php7.1-json \ + php7.1-ldap \ + php7.1-libvirt-php \ + php7.1-lua \ + php7.1-lz4 \ + php7.1-mailparse \ + php7.1-mbstring \ + php7.1-mcrypt \ + php7.1-memcache \ + php7.1-memcached \ + php7.1-mongodb \ + php7.1-msgpack \ + php7.1-mysql \ + php7.1-oauth \ + php7.1-odbc \ + php7.1-opcache \ + php7.1-pcov \ + php7.1-pgsql \ + php7.1-phpdbg \ + php7.1-pinba \ +# php7.1-pq \ + php7.1-propro \ + php7.1-protobuf \ + php7.1-ps \ + php7.1-pspell \ + php7.1-radius \ + php7.1-raphf \ + php7.1-rdkafka \ + php7.1-readline \ + php7.1-recode \ + php7.1-redis \ + php7.1-rrd \ + php7.1-smbclient \ + php7.1-snmp \ + php7.1-soap \ + php7.1-sodium \ + php7.1-solr \ + php7.1-sqlite3 \ + php7.1-ssh2 \ + php7.1-stomp \ + php7.1-sybase \ + php7.1-tideways \ + php7.1-tidy \ + php7.1-uopz \ + php7.1-uploadprogress \ + php7.1-uuid \ + php7.1-vips \ + php7.1-xdebug \ + php7.1-xhprof \ + php7.1-xml \ + php7.1-xmlrpc \ + php7.1-xsl \ +# php7.1-yac \ + php7.1-yaml \ + php7.1-zip \ + php7.1-zmq \ + php7.1-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ +# php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.2,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.1 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +RUN pecl install cassandra && \ + echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php71.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.1.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.1.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php71/Makefile b/linux/ecosystem/teamcity/agent/php71/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php71/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node10/README.md b/linux/ecosystem/teamcity/agent/php71/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node10/README.md rename to linux/ecosystem/teamcity/agent/php71/README.md diff --git a/linux/ecosystem/teamcity/agent/php71/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php71/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php71/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php71/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php71/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php71/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php71/docker-compose.yml b/linux/ecosystem/teamcity/agent/php71/docker-compose.yml new file mode 100644 index 000000000..1ef3b0fdb --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php71/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/teamcity-agent:php7.1" + build: + context: . diff --git a/linux/ecosystem/teamcity/agent/php71/usr/lib/php/20160303/phpBolt-extension-1.0.4-php71.so b/linux/ecosystem/teamcity/agent/php71/usr/lib/php/20160303/phpBolt-extension-1.0.4-php71.so new file mode 100644 index 000000000..75149ffcf Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php71/usr/lib/php/20160303/phpBolt-extension-1.0.4-php71.so differ diff --git a/linux/ecosystem/teamcity/agent/php71/usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so b/linux/ecosystem/teamcity/agent/php71/usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so new file mode 100644 index 000000000..75149ffcf Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php71/usr/lib/php/20160303/phpBolt-extension-1.0.5-php71.so differ diff --git a/linux/ecosystem/teamcity/agent/php72/Dockerfile b/linux/ecosystem/teamcity/agent/php72/Dockerfile new file mode 100644 index 000000000..fb0060ea3 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php72/Dockerfile @@ -0,0 +1,390 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV BuildDocker true + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.2 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20170718 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.2 \ + php7.2-common \ + php7.2-dev \ + php7.2-fpm \ + php7.2-cli \ + php7.2-xml \ + php7.2-cgi && \ + update-alternatives --set php /usr/bin/php7.2 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_PATH=/usr/lib/php/20170718 +ENV PHP_VER=7.2 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.2 \ + php7.2-cli \ + php7.2-common \ + php7.2-dev \ + php7.2-amqp \ + php7.2-apcu-bc \ + php7.2-apcu \ + php7.2-ast \ + php7.2-bcmath \ + php7.2-bz2 \ + php7.2-cgi \ + php7.2-curl \ + php7.2-dba \ + php7.2-decimal \ + php7.2-dio \ + php7.2-ds \ + php7.2-enchant \ + php7.2-excimer \ + php7.2-fpm \ + php7.2-gd \ + php7.2-gearman \ + php7.2-geoip \ +# php7.2-gmagick \ + php7.2-gmp \ + php7.2-gnupg \ + php7.2-grpc \ + php7.2-http \ + php7.2-igbinary \ + php7.2-imagick \ + php7.2-imap \ + php7.2-inotify \ + php7.2-interbase \ + php7.2-intl \ + php7.2-json \ + php7.2-ldap \ + php7.2-libvirt-php \ + php7.2-lua \ + php7.2-lz4 \ + php7.2-mailparse \ + php7.2-maxminddb \ + php7.2-mbstring \ + php7.2-mcrypt \ + php7.2-memcache \ + php7.2-memcached \ + php7.2-mongodb \ + php7.2-msgpack \ + php7.2-mysql \ + php7.2-oauth \ + php7.2-odbc \ + php7.2-opcache \ + php7.2-pcov \ + php7.2-pgsql \ +# php7.2-phalcon4 \ + php7.2-phpdbg \ + php7.2-pinba \ +# php7.2-pq \ + php7.2-propro \ + php7.2-protobuf \ + php7.2-ps \ + php7.2-pspell \ + php7.2-radius \ + php7.2-raphf \ + php7.2-rdkafka \ + php7.2-readline \ + php7.2-recode \ + php7.2-redis \ + php7.2-rrd \ + php7.2-smbclient \ + php7.2-snmp \ + php7.2-soap \ + php7.2-solr \ + php7.2-sqlite3 \ + php7.2-ssh2 \ + php7.2-stomp \ + php7.2-sybase \ + php7.2-tideways \ + php7.2-tidy \ + php7.2-uopz \ + php7.2-uploadprogress \ + php7.2-uuid \ + php7.2-vips \ + php7.2-xdebug \ + php7.2-xhprof \ + php7.2-xml \ + php7.2-xmlrpc \ + php7.2-xsl \ +# php7.2-yac \ + php7.2-yaml \ + php7.2-zip \ + php7.2-zmq \ + php7.2-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ +# php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.3,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.2 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + iconv \ + imap \ + json \ + mbstring \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20170718/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php72.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.2.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension= ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +# ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php72/Makefile b/linux/ecosystem/teamcity/agent/php72/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php72/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node11/README.md b/linux/ecosystem/teamcity/agent/php72/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node11/README.md rename to linux/ecosystem/teamcity/agent/php72/README.md diff --git a/linux/ecosystem/teamcity/agent/php72/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php72/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php72/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php72/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php72/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php72/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/teamcity/agent/php7.2/docker-compose.yml b/linux/ecosystem/teamcity/agent/php72/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/php7.2/docker-compose.yml rename to linux/ecosystem/teamcity/agent/php72/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/cassandra.so b/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/cassandra.so new file mode 100644 index 000000000..fb54b0cbd Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/cassandra.so differ diff --git a/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/phpBolt-extension-1.0.4-php72.so b/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/phpBolt-extension-1.0.4-php72.so new file mode 100644 index 000000000..d4aac7cd7 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/phpBolt-extension-1.0.4-php72.so differ diff --git a/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so b/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so new file mode 100644 index 000000000..d4aac7cd7 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php72/usr/lib/php/20170718/phpBolt-extension-1.0.5-php72.so differ diff --git a/linux/ecosystem/teamcity/agent/php73/Dockerfile b/linux/ecosystem/teamcity/agent/php73/Dockerfile new file mode 100644 index 000000000..b139b8800 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php73/Dockerfile @@ -0,0 +1,394 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV BuildDocker true + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.3 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ARG P4MODULE_PATH=/usr/lib/php/20180731 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/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 \ + libmemcached-dev \ +# php-pear \ + php7.3 \ + php7.3-common \ + php7.3-dev \ + php7.3-fpm \ + php7.3-cli \ + php7.3-xml \ + php7.3-cgi && \ + update-alternatives --set php /usr/bin/php7.3 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_PATH=/usr/lib/php/20180731 +ENV PHP_VER=7.3 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.3 \ + php7.3-cli \ + php7.3-common \ + php7.3-dev \ + php7.3-amqp \ + php7.3-apcu-bc \ + php7.3-apcu \ + php7.3-ast \ + php7.3-bcmath \ + php7.3-bz2 \ + php7.3-cgi \ + php7.3-curl \ + php7.3-dba \ + php7.3-decimal \ + php7.3-dio \ + php7.3-ds \ + php7.3-enchant \ + php7.3-excimer \ + php7.3-fpm \ + php7.3-gd \ + php7.3-gearman \ + php7.3-geoip \ +# php7.3-gmagick \ + php7.3-gmp \ + php7.3-gnupg \ + php7.3-grpc \ + php7.3-http \ + php7.3-igbinary \ + php7.3-imagick \ + php7.3-imap \ + php7.3-inotify \ + php7.3-interbase \ + php7.3-intl \ + php7.3-json \ + php7.3-ldap \ + php7.3-libvirt-php \ + php7.3-lua \ + php7.3-lz4 \ + php7.3-mailparse \ + php7.3-maxminddb \ + php7.3-mbstring \ + php7.3-mcrypt \ + php7.3-memcache \ + php7.3-memcached \ + php7.3-mongodb \ + php7.3-msgpack \ + php7.3-mysql \ + php7.3-oauth \ + php7.3-odbc \ + php7.3-opcache \ + php7.3-pcov \ + php7.3-pgsql \ +# php7.3-phalcon4 \ + php7.3-phpdbg \ + php7.3-pinba \ +# php7.3-pq \ + php7.3-propro \ + php7.3-protobuf \ + php7.3-ps \ + php7.3-pspell \ +# php7.3-psr \ + php7.3-radius \ + php7.3-raphf \ + php7.3-rdkafka \ + php7.3-readline \ + php7.3-recode \ + php7.3-redis \ + php7.3-rrd \ + php7.3-smbclient \ + php7.3-snmp \ + php7.3-soap \ + php7.3-solr \ + php7.3-sqlite3 \ + php7.3-ssh2 \ + php7.3-stomp \ + php7.3-sybase \ + php7.3-tideways \ + php7.3-tidy \ + php7.3-uopz \ + php7.3-uploadprogress \ + php7.3-uuid \ + php7.3-vips \ + php7.3-xdebug \ + php7.3-xhprof \ + php7.3-xml \ + php7.3-xmlrpc \ + php7.3-xsl \ +# php7.3-yac \ + php7.3-yaml \ + php7.3-zip \ + php7.3-zmq \ + php7.3-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ +# php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.4,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.3 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gettext \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20180731/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php73.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.3.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension = ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php73/Makefile b/linux/ecosystem/teamcity/agent/php73/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php73/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node12/README.md b/linux/ecosystem/teamcity/agent/php73/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node12/README.md rename to linux/ecosystem/teamcity/agent/php73/README.md diff --git a/linux/ecosystem/teamcity/agent/php73/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php73/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php73/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php73/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php73/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php73/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/teamcity/agent/php7.3/docker-compose.yml b/linux/ecosystem/teamcity/agent/php73/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/php7.3/docker-compose.yml rename to linux/ecosystem/teamcity/agent/php73/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/cassandra.so b/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/cassandra.so new file mode 100644 index 000000000..48ec4a0af Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/cassandra.so differ diff --git a/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/phpBolt-extension-1.0.4-php73.so b/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/phpBolt-extension-1.0.4-php73.so new file mode 100644 index 000000000..b469217df Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/phpBolt-extension-1.0.4-php73.so differ diff --git a/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so b/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so new file mode 100644 index 000000000..b469217df Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php73/usr/lib/php/20180731/phpBolt-extension-1.0.5-php73.so differ diff --git a/linux/ecosystem/teamcity/agent/php74/Dockerfile b/linux/ecosystem/teamcity/agent/php74/Dockerfile new file mode 100644 index 000000000..2609c8cb4 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php74/Dockerfile @@ -0,0 +1,412 @@ +FROM hub.epicm.org/epicmorg/debian:bookworm-develop AS builder +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV BuildDocker true + +ARG BUILDS_DIR=/builds +ARG SRC_DIR=${BUILDS_DIR}/src +ARG EXPORT_DIR=${BUILDS_DIR}/export +ARG P4API_DIR=${SRC_DIR}/p4api +ARG P4PHP_DIR=${SRC_DIR}/p4php +ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 + +ARG P4API_VER=r20.1 +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz + +ARG P4PHP_VER=r20.1 +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz + +ENV PHP_MODULE_PATH=/usr/lib/php/20190902 + +################################################################## +# Files and folders +################################################################## +RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} + +################################################################## +# Installing PHP7 +###################################################################installing PHP repo +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + smbclient libsmbclient libsmbclient-dev \ +# php-pear \ + php7.4 \ + php7.4-common \ + php7.4-dev \ + php7.4-fpm \ + php7.4-cli \ + php7.4-xml \ + php7.4-cgi && \ + update-alternatives --set php /usr/bin/php7.4 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# preparing p4src +################################################################## +RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ + wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ + wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ + cd ${P4API_DIR} && \ + ls -las && \ + cd ${P4PHP_DIR} && \ + ls -las && \ + cd ${MAKE_DIR} && \ + ls -las && \ + cd ${SRC_DIR} && \ + ls -las + +################################################################## +# compilling p4src +################################################################## +RUN cd ${MAKE_DIR} && \ + ls -las && \ + phpize && \ + ./configure --with-perforce=${P4API_DIR} && \ + make && \ + make test && \ + make install && \ + cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} + +################################################################## +# compilling smbclient +################################################################## +#RUN pecl install smbclient && \ +# cp ${PHP_MODULE_PATH}/smbclient.so ${EXPORT_DIR} + +################################################################## +################################################################## +################################################################## + +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_PATH=/usr/lib/php/20190902 +ENV PHP_VER=7.4 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP7 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php7.4 \ + php7.4-cli \ + php7.4-common \ + php7.4-dev \ + php7.4-amqp \ + php7.4-apcu-bc \ + php7.4-apcu \ + php7.4-ast \ + php7.4-bcmath \ + php7.4-bz2 \ + php7.4-cgi \ + php7.4-curl \ + php7.4-dba \ + php7.4-decimal \ + php7.4-dio \ + php7.4-ds \ + php7.4-enchant \ + php7.4-excimer \ + php7.4-fpm \ + php7.4-gd \ + php7.4-gearman \ + php7.4-geoip \ +# php7.4-gmagick \ + php7.4-gmp \ + php7.4-gnupg \ + php7.4-grpc \ + php7.4-http \ + php7.4-igbinary \ + php7.4-imagick \ + php7.4-imap \ + php7.4-inotify \ + php7.4-interbase \ + php7.4-intl \ + php7.4-json \ + php7.4-ldap \ + php7.4-libvirt-php \ + php7.4-lua \ + php7.4-lz4 \ + php7.4-mailparse \ + php7.4-maxminddb \ + php7.4-mbstring \ + php7.4-mcrypt \ + php7.4-memcache \ + php7.4-memcached \ + php7.4-mongodb \ + php7.4-msgpack \ + php7.4-mysql \ + php7.4-oauth \ + php7.4-odbc \ + php7.4-opcache \ + php7.4-pcov \ + php7.4-pgsql \ + php7.4-phalcon4 \ +# php7.4-phalcon5 \ + php7.4-phpdbg \ + php7.4-pinba \ + php7.4-pq \ + php7.4-propro \ + php7.4-protobuf \ + php7.4-ps \ + php7.4-pspell \ + php7.4-psr \ + php7.4-radius \ + php7.4-raphf \ + php7.4-rdkafka \ + php7.4-readline \ + php7.4-redis \ + php7.4-rrd \ + php7.4-smbclient \ + php7.4-snmp \ + php7.4-soap \ + php7.4-solr \ + php7.4-sqlite3 \ + php7.4-ssh2 \ + php7.4-stomp \ + php7.4-sybase \ + php7.4-tideways \ + php7.4-tidy \ + php7.4-uopz \ + php7.4-uploadprogress \ + php7.4-uuid \ + php7.4-vips \ + php7.4-xdebug \ + php7.4-xhprof \ + php7.4-xml \ + php7.4-xmlrpc \ + php7.4-xsl \ +# php7.4-yac \ + php7.4-yaml \ + php7.4-zip \ + php7.4-zmq \ + php7.4-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ +# php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,8.0,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php7.4 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20190902/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php74.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.4.so ${PHP_MODULE_PATH} && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} +RUN echo "extension = ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing smbclient addon +################################################################## +#COPY --from=builder /builds/export/smbclient.so ${PHP_MODULE_PATH} +#RUN echo "extension = ${PHP_MODULE_PATH}/smbclient.so" > ${SMB_PHP_INI} && \ +# ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cgi/conf.d/smbclient.ini && \ +# ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cli/conf.d/smbclient.ini && \ +# ln -sf ${SMB_PHP_INI} ${PHP_DIR}/fpm/conf.d/smbclient.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php74/Makefile b/linux/ecosystem/teamcity/agent/php74/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php74/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node13/README.md b/linux/ecosystem/teamcity/agent/php74/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node13/README.md rename to linux/ecosystem/teamcity/agent/php74/README.md diff --git a/linux/ecosystem/teamcity/agent/php74/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php74/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php74/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php74/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php74/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php74/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/teamcity/agent/php7.4/docker-compose.yml b/linux/ecosystem/teamcity/agent/php74/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/php7.4/docker-compose.yml rename to linux/ecosystem/teamcity/agent/php74/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/cassandra.so b/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/cassandra.so new file mode 100644 index 000000000..9f6332a44 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/cassandra.so differ diff --git a/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so b/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so new file mode 100644 index 000000000..9e8df1195 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so differ diff --git a/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so b/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so new file mode 100644 index 000000000..9e8df1195 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php74/usr/lib/php/20190902/phpBolt-extension-1.0.5-php74.so differ diff --git a/linux/ecosystem/teamcity/agent/php80/Dockerfile b/linux/ecosystem/teamcity/agent/php80/Dockerfile new file mode 100644 index 000000000..d2b77e40b --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php80/Dockerfile @@ -0,0 +1,306 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_VER=20200930 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_VER=8.0 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.0 \ + php8.0-cli \ + php8.0-common \ + php8.0-dev \ + php8.0-amqp \ + php8.0-apcu \ + php8.0-ast \ + php8.0-bcmath \ + php8.0-bz2 \ + php8.0-cgi \ + php8.0-curl \ + php8.0-dba \ + php8.0-decimal \ + php8.0-dio \ + php8.0-ds \ + php8.0-enchant \ + php8.0-excimer \ + php8.0-fpm \ + php8.0-gd \ + php8.0-gearman \ +# php8.0-gmagick \ + php8.0-gmp \ + php8.0-gnupg \ + php8.0-grpc \ + php8.0-http \ + php8.0-igbinary \ + php8.0-imagick \ + php8.0-imap \ + php8.0-inotify \ + php8.0-interbase \ + php8.0-intl \ + php8.0-ldap \ + php8.0-libvirt-php \ + php8.0-lz4 \ + php8.0-mailparse \ + php8.0-maxminddb \ + php8.0-mbstring \ + php8.0-mcrypt \ + php8.0-memcache \ + php8.0-memcached \ + php8.0-mongodb \ + php8.0-msgpack \ + php8.0-mysql \ + php8.0-oauth \ + php8.0-odbc \ + php8.0-opcache \ + php8.0-pcov \ + php8.0-pgsql \ + php8.0-phalcon5 \ + php8.0-phpdbg \ + php8.0-pinba \ +# php8.0-pq \ +# php8.0-propro \ + php8.0-protobuf \ + php8.0-ps \ + php8.0-pspell \ +# php8.0-psr \ + php8.0-raphf \ + php8.0-rdkafka \ + php8.0-readline \ + php8.0-redis \ + php8.0-rrd \ + php8.0-smbclient \ + php8.0-snmp \ + php8.0-soap \ + php8.0-solr \ + php8.0-sqlite3 \ + php8.0-ssh2 \ + php8.0-stomp \ + php8.0-swoole \ + php8.0-sybase \ + php8.0-tideways \ + php8.0-tidy \ + php8.0-uopz \ + php8.0-uploadprogress \ + php8.0-uuid \ + php8.0-vips \ + php8.0-xdebug \ + php8.0-xhprof \ + php8.0-xml \ + php8.0-xmlrpc \ + php8.0-xsl \ +# php8.0-yac \ + php8.0-yaml \ + php8.0-zip \ + php8.0-zmq \ + php8.0-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ +# php8.0* \ + php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.1,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php8.0 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20200930/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php80.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing P4 addon +################################################################## +RUN wget -q --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80.so --random-wait -O ${PHP_MODULE_PATH}/perforce_php80.so && \ + wget -q --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.0.2.so --random-wait -O ${PHP_MODULE_PATH}/perforce_php80-ssl1.0.2.so && \ + wget -q --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.1.1.so --random-wait -O ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so + +#COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} + +RUN echo "extension = ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so" > ${P4_PHP_INI} && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ + ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +# NOT OFFICIALLY SUPPORTED +# +#ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +#RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ +# cp /tmp/ioncube/ioncube_loader_lin_8.0.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/apache2/php.ini && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.0.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php80/Makefile b/linux/ecosystem/teamcity/agent/php80/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php80/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node14/README.md b/linux/ecosystem/teamcity/agent/php80/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node14/README.md rename to linux/ecosystem/teamcity/agent/php80/README.md diff --git a/linux/ecosystem/teamcity/agent/php80/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php80/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php80/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php80/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php80/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php80/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/teamcity/agent/php8.0/docker-compose.yml b/linux/ecosystem/teamcity/agent/php80/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/php8.0/docker-compose.yml rename to linux/ecosystem/teamcity/agent/php80/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/cassandra.so b/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/cassandra.so new file mode 100644 index 000000000..c7de65288 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/cassandra.so differ diff --git a/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/phpBolt-extension-1.0.4-php80.so b/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/phpBolt-extension-1.0.4-php80.so new file mode 100644 index 000000000..6813727b3 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/phpBolt-extension-1.0.4-php80.so differ diff --git a/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so b/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so new file mode 100644 index 000000000..6813727b3 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php80/usr/lib/php/20200930/phpBolt-extension-1.0.5-php80.so differ diff --git a/linux/ecosystem/teamcity/agent/php81/Dockerfile b/linux/ecosystem/teamcity/agent/php81/Dockerfile new file mode 100644 index 000000000..9adbe2666 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php81/Dockerfile @@ -0,0 +1,288 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.1 +ENV PHP_MODULE_VER=20210902 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.1 \ + php8.1-cli \ + php8.1-common \ + php8.1-dev \ + php8.1-amqp \ + php8.1-apcu \ + php8.1-ast \ + php8.1-bcmath \ + php8.1-bz2 \ + php8.1-cgi \ + php8.1-curl \ + php8.1-dba \ + php8.1-decimal \ + php8.1-dio \ + php8.1-ds \ + php8.1-enchant \ + php8.1-excimer \ + php8.1-fpm \ + php8.1-gd \ + php8.1-gearman \ +# php8.1-gmagick \ + php8.1-gmp \ + php8.1-gnupg \ + php8.1-grpc \ + php8.1-http \ + php8.1-igbinary \ + php8.1-imagick \ + php8.1-imap \ + php8.1-inotify \ + php8.1-interbase \ + php8.1-intl \ + php8.1-ldap \ + php8.1-libvirt-php \ + php8.1-lz4 \ + php8.1-mailparse \ + php8.1-maxminddb \ + php8.1-mbstring \ + php8.1-mcrypt \ + php8.1-memcache \ + php8.1-memcached \ + php8.1-mongodb \ + php8.1-msgpack \ + php8.1-mysql \ + php8.1-oauth \ + php8.1-odbc \ + php8.1-opcache \ + php8.1-pcov \ + php8.1-pgsql \ +# php8.1-phalcon5 \ + php8.1-phpdbg \ + php8.1-pinba \ +# php8.1-pq \ +# php8.1-propro \ + php8.1-protobuf \ + php8.1-ps \ + php8.1-pspell \ +# php8.1-psr \ + php8.1-raphf \ + php8.1-rdkafka \ + php8.1-readline \ + php8.1-redis \ + php8.1-rrd \ + php8.1-smbclient \ + php8.1-snmp \ + php8.1-soap \ + php8.1-solr \ + php8.1-sqlite3 \ + php8.1-ssh2 \ + php8.1-stomp \ + php8.1-swoole \ + php8.1-sybase \ + php8.1-tideways \ + php8.1-tidy \ + php8.1-uopz \ + php8.1-uploadprogress \ + php8.1-uuid \ + php8.1-vips \ + php8.1-xdebug \ + php8.1-xhprof \ + php8.1-xml \ + php8.1-xmlrpc \ + php8.1-xsl \ +# php8.1-yac \ + php8.1-yaml \ + php8.1-zip \ + php8.1-zmq \ + php8.1-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ +# php8.1* \ + php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.2,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php8.1 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20210902/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php81.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.1.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php81/Makefile b/linux/ecosystem/teamcity/agent/php81/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php81/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node15/README.md b/linux/ecosystem/teamcity/agent/php81/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node15/README.md rename to linux/ecosystem/teamcity/agent/php81/README.md diff --git a/linux/ecosystem/teamcity/agent/php81/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php81/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php81/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php81/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php81/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php81/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/teamcity/agent/php8.1/docker-compose.yml b/linux/ecosystem/teamcity/agent/php81/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/php8.1/docker-compose.yml rename to linux/ecosystem/teamcity/agent/php81/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/cassandra.so b/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/cassandra.so new file mode 100644 index 000000000..f2d94833c Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/cassandra.so differ diff --git a/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so b/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so new file mode 100644 index 000000000..b04d217c3 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so differ diff --git a/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so b/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so new file mode 100644 index 000000000..b04d217c3 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php81/usr/lib/php/20210902/phpBolt-extension-1.0.5-php81.so differ diff --git a/linux/ecosystem/teamcity/agent/php82/Dockerfile b/linux/ecosystem/teamcity/agent/php82/Dockerfile new file mode 100644 index 000000000..144cb0bd0 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php82/Dockerfile @@ -0,0 +1,288 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.2 +ENV PHP_MODULE_VER=20220829 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.2 \ + php8.2-cli \ + php8.2-common \ + php8.2-dev \ + php8.2-amqp \ + php8.2-apcu \ + php8.2-ast \ + php8.2-bcmath \ + php8.2-bz2 \ + php8.2-cgi \ + php8.2-curl \ + php8.2-dba \ + php8.2-decimal \ + php8.2-dio \ + php8.2-ds \ + php8.2-enchant \ + php8.2-excimer \ + php8.2-fpm \ + php8.2-gd \ + php8.2-gearman \ +# php8.2-gmagick \ + php8.2-gmp \ + php8.2-gnupg \ + php8.2-grpc \ + php8.2-http \ + php8.2-igbinary \ + php8.2-imagick \ + php8.2-imap \ + php8.2-inotify \ + php8.2-interbase \ + php8.2-intl \ + php8.2-ldap \ + php8.2-libvirt-php \ + php8.2-lz4 \ + php8.2-mailparse \ + php8.2-maxminddb \ + php8.2-mbstring \ + php8.2-mcrypt \ + php8.2-memcache \ + php8.2-memcached \ + php8.2-mongodb \ + php8.2-msgpack \ + php8.2-mysql \ + php8.2-oauth \ + php8.2-odbc \ + php8.2-opcache \ + php8.2-pcov \ + php8.2-pgsql \ +# php8.2-phalcon5 \ + php8.2-phpdbg \ + php8.2-pinba \ +# php8.2-pq \ +# php8.2-propro \ + php8.2-protobuf \ + php8.2-ps \ + php8.2-pspell \ + php8.2-psr \ + php8.2-raphf \ + php8.2-rdkafka \ + php8.2-readline \ + php8.2-redis \ + php8.2-rrd \ + php8.2-smbclient \ + php8.2-snmp \ + php8.2-soap \ + php8.2-solr \ + php8.2-sqlite3 \ + php8.2-ssh2 \ + php8.2-stomp \ + php8.2-swoole \ + php8.2-sybase \ + php8.2-tideways \ + php8.2-tidy \ + php8.2-uopz \ + php8.2-uploadprogress \ + php8.2-uuid \ + php8.2-vips \ + php8.2-xdebug \ + php8.2-xhprof \ + php8.2-xml \ + php8.2-xmlrpc \ + php8.2-xsl \ +# php8.2-yac \ + php8.2-yaml \ + php8.2-zip \ + php8.2-zmq \ + php8.2-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ +# php8.2* \ + php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.3,8.4} && \ + update-alternatives --set php /usr/bin/php8.2 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +COPY usr/lib/php/20220829/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ + ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php82.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.2.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php82/Makefile b/linux/ecosystem/teamcity/agent/php82/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php82/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node16/README.md b/linux/ecosystem/teamcity/agent/php82/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node16/README.md rename to linux/ecosystem/teamcity/agent/php82/README.md diff --git a/linux/ecosystem/teamcity/agent/php82/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php82/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php82/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php82/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php82/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php82/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/teamcity/agent/php8.2/docker-compose.yml b/linux/ecosystem/teamcity/agent/php82/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/php8.2/docker-compose.yml rename to linux/ecosystem/teamcity/agent/php82/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/cassandra.so b/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/cassandra.so new file mode 100644 index 000000000..2e94ad443 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/cassandra.so differ diff --git a/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/phpBolt-extension-1.0.4-php82.so b/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/phpBolt-extension-1.0.4-php82.so new file mode 100644 index 000000000..ed75ab215 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/phpBolt-extension-1.0.4-php82.so differ diff --git a/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so b/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so new file mode 100644 index 000000000..ed75ab215 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php82/usr/lib/php/20220829/phpBolt-extension-1.0.5-php82.so differ diff --git a/linux/ecosystem/teamcity/agent/php83/Dockerfile b/linux/ecosystem/teamcity/agent/php83/Dockerfile new file mode 100644 index 000000000..31b78cd55 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php83/Dockerfile @@ -0,0 +1,285 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.3 +ENV PHP_MODULE_VER=20230831 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.3 \ + php8.3-cli \ + php8.3-common \ + php8.3-dev \ + php8.3-amqp \ + php8.3-apcu \ + php8.3-ast \ + php8.3-bcmath \ + php8.3-bz2 \ + php8.3-cgi \ + php8.3-curl \ + php8.3-dba \ + php8.3-decimal \ + php8.3-dio \ + php8.3-ds \ + php8.3-enchant \ + php8.3-excimer \ + php8.3-fpm \ + php8.3-gd \ + php8.3-gearman \ +# php8.3-gmagick \ + php8.3-gmp \ + php8.3-gnupg \ + php8.3-grpc \ + php8.3-http \ + php8.3-igbinary \ + php8.3-imagick \ + php8.3-imap \ + php8.3-inotify \ + php8.3-interbase \ + php8.3-intl \ + php8.3-ldap \ + php8.3-libvirt-php \ + php8.3-mailparse \ + php8.3-maxminddb \ + php8.3-mbstring \ + php8.3-mcrypt \ + php8.3-memcache \ + php8.3-memcached \ + php8.3-mongodb \ + php8.3-msgpack \ + php8.3-mysql \ + php8.3-oauth \ + php8.3-odbc \ + php8.3-opcache \ + php8.3-pcov \ + php8.3-pgsql \ +# php8.3-phalcon5 \ + php8.3-phpdbg \ + php8.3-pinba \ +# php8.3-pq \ + php8.3-protobuf \ + php8.3-ps \ + php8.3-pspell \ +# php8.3-psr \ + php8.3-raphf \ + php8.3-rdkafka \ + php8.3-readline \ + php8.3-redis \ + php8.3-rrd \ + php8.3-smbclient \ + php8.3-snmp \ + php8.3-soap \ + php8.3-solr \ + php8.3-sqlite3 \ + php8.3-ssh2 \ + php8.3-stomp \ + php8.3-swoole \ + php8.3-sybase \ + php8.3-tidy \ + php8.3-uopz \ + php8.3-uploadprogress \ + php8.3-uuid \ + php8.3-vips \ + php8.3-xdebug \ + php8.3-xhprof \ + php8.3-xml \ + php8.3-xmlrpc \ + php8.3-xsl \ +# php8.3-yac \ + php8.3-yaml \ + php8.3-zip \ + php8.3-zmq \ + php8.3-zstd \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ +# php8.3* \ + php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.4} && \ + update-alternatives --set php /usr/bin/php8.3 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +#COPY usr/lib/php/20220829/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +#RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +## ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing timezonedb addon +################################################################## +RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +COPY usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/apache2/php.ini && \ +RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php83.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.3.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.3.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php83/Makefile b/linux/ecosystem/teamcity/agent/php83/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php83/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node17/README.md b/linux/ecosystem/teamcity/agent/php83/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node17/README.md rename to linux/ecosystem/teamcity/agent/php83/README.md diff --git a/linux/ecosystem/teamcity/agent/php83/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php83/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php83/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php83/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php83/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php83/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/obsolete/teamcity/agent/php8.3/docker-compose.yml b/linux/ecosystem/teamcity/agent/php83/docker-compose.yml similarity index 100% rename from linux/obsolete/teamcity/agent/php8.3/docker-compose.yml rename to linux/ecosystem/teamcity/agent/php83/docker-compose.yml diff --git a/linux/ecosystem/teamcity/agent/php83/usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so b/linux/ecosystem/teamcity/agent/php83/usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so new file mode 100644 index 000000000..86e34521d Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php83/usr/lib/php/20230831/phpBolt-extension-1.0.5-php83.so differ diff --git a/linux/ecosystem/teamcity/agent/php84/Dockerfile b/linux/ecosystem/teamcity/agent/php84/Dockerfile new file mode 100644 index 000000000..9e870eddd --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php84/Dockerfile @@ -0,0 +1,232 @@ +FROM hub.epicm.org/epicmorg/teamcity-agent:minimal +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=8.4 +ENV PHP_MODULE_VER=20240924 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing PHP8 +################################################################## +RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.su/php/apt.gpg +RUN sh -c 'echo "deb [trusted=yes] https://packages.sury.su/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + libmemcached-dev \ + libgmp-dev \ +# php-pear \ + php8.4 \ + php8.4-cli \ + php8.4-common \ + php8.4-dev \ + php8.4-bcmath \ + php8.4-bz2 \ + php8.4-cgi \ + php8.4-curl \ + php8.4-dba \ + php8.4-enchant \ + php8.4-fpm \ + php8.4-gd \ + php8.4-gmp \ + php8.4-interbase \ + php8.4-intl \ + php8.4-ldap \ + php8.4-mbstring \ + php8.4-mysql \ + php8.4-odbc \ + php8.4-opcache \ + php8.4-pgsql \ + php8.4-phpdbg \ + php8.4-readline \ + php8.4-snmp \ + php8.4-soap \ + php8.4-sqlite3 \ + php8.4-sybase \ + php8.4-tidy \ + php8.4-xml \ + php8.4-xsl \ + php8.4-zip \ + smbclient \ + libsmbclient \ + sendmail && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + apt-get remove -y \ + php5.6* \ + php7.0* \ + php7.1* \ + php7.2* \ + php7.3* \ + php7.4* \ + php8.0* \ + php8.1* \ + php8.2* \ + php8.3* && \ +# php8.4* && \ + rm -rfv /etc/php/{5.6,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3} && \ + update-alternatives --set php /usr/bin/php8.4 && \ +# pear clear-cache && \ + pear update-channels && \ +# pear upgrade && \ + pecl channel-update pecl.php.net + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" + +################################################################## +# Enabling extensions +################################################################## +RUN phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + phpdismod \ + xdebug \ + xcache \ + xhprof \ + tideways \ + pcov \ + swoole \ + grpc \ + uopz && \ + php -m && \ + php -v + +############################################################################## +# Cassandra CPP Support Install +############################################################################## +COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_amd64.deb +RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ + https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb + +RUN cd /tmp/cassandra-php-driver && \ + dpkg -i ./libssl1.1_1.1.1_amd64.deb && \ + dpkg -i ./multiarch-support_2.28_amd64.deb && \ + dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ + dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ + dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN pecl install cassandra && \ +#COPY usr/lib/php/20240924/cassandra.so ${PHP_MODULE_PATH}/cassandra.so +#RUN echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +## ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing timezonedb addon +################################################################## +#RUN pecl install timezonedb && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Bolt addon +################################################################## +#ADD https://phpbolt.com/wp-content/uploads/2023/03/phpBolt-extension-1.0.5.zip /tmp/phpBolt.zip +#COPY usr/lib/php/20240924/phpBolt-extension-1.0.5-php84.so ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so +##RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/apache2/php.ini && \ +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/cgi/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/cli/php.ini && \ +# echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.5-php84.so" >> ${PHP_DIR}/fpm/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing IOnCube addon +################################################################# +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.4.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.4.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +RUN cd /tmp && \ + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ + php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ + rm /tmp/composer-setup.php + +################################################################## +# Cleanup +################################################################## +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/* + +################################################################## +# final config +################################################################## +WORKDIR ${AGENT_DIST} + +RUN updatedb diff --git a/linux/ecosystem/teamcity/agent/php84/Makefile b/linux/ecosystem/teamcity/agent/php84/Makefile new file mode 100644 index 000000000..b88fa3708 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php84/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +deploy: + make deploy-kaniko + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +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 + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/node18/README.md b/linux/ecosystem/teamcity/agent/php84/README.md similarity index 100% rename from linux/obsolete/teamcity/agent/node18/README.md rename to linux/ecosystem/teamcity/agent/php84/README.md diff --git a/linux/ecosystem/teamcity/agent/php84/addons/libssl1.1_1.1.1_amd64.deb b/linux/ecosystem/teamcity/agent/php84/addons/libssl1.1_1.1.1_amd64.deb new file mode 100644 index 000000000..67b5d7314 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php84/addons/libssl1.1_1.1.1_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php84/addons/multiarch-support_2.28_amd64.deb b/linux/ecosystem/teamcity/agent/php84/addons/multiarch-support_2.28_amd64.deb new file mode 100644 index 000000000..7cf23ffa8 Binary files /dev/null and b/linux/ecosystem/teamcity/agent/php84/addons/multiarch-support_2.28_amd64.deb differ diff --git a/linux/ecosystem/teamcity/agent/php84/docker-compose.yml b/linux/ecosystem/teamcity/agent/php84/docker-compose.yml new file mode 100644 index 000000000..b2b200c37 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/php84/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "hub.epicm.org/epicmorg/teamcity-agent:php8.4" + build: + context: . diff --git a/linux/ecosystem/vk2discord/Dockerfile b/linux/ecosystem/vk2discord/Dockerfile index 43bffe2dd..1cb265a8b 100644 --- a/linux/ecosystem/vk2discord/Dockerfile +++ b/linux/ecosystem/vk2discord/Dockerfile @@ -19,9 +19,9 @@ RUN cp -rfv /tmp/vk2discord/* /usr/src/vk2discord/ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /tmp/vk2discord/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/devel/jdk11/Dockerfile b/linux/obsolete/epicmorg/devel/jdk11/Dockerfile index a2abaa112..0ae332b0a 100644 --- a/linux/obsolete/epicmorg/devel/jdk11/Dockerfile +++ b/linux/obsolete/epicmorg/devel/jdk11/Dockerfile @@ -18,7 +18,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/devel/jdk16/Dockerfile b/linux/obsolete/epicmorg/devel/jdk16/Dockerfile index b18a003cd..8f76a1425 100644 --- a/linux/obsolete/epicmorg/devel/jdk16/Dockerfile +++ b/linux/obsolete/epicmorg/devel/jdk16/Dockerfile @@ -18,7 +18,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/devel/jdk6/Dockerfile b/linux/obsolete/epicmorg/devel/jdk6/Dockerfile index 997a621d9..119df09c1 100644 --- a/linux/obsolete/epicmorg/devel/jdk6/Dockerfile +++ b/linux/obsolete/epicmorg/devel/jdk6/Dockerfile @@ -14,7 +14,7 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/devel/jdk7/Dockerfile b/linux/obsolete/epicmorg/devel/jdk7/Dockerfile index bf76bfa42..8e3a468f4 100644 --- a/linux/obsolete/epicmorg/devel/jdk7/Dockerfile +++ b/linux/obsolete/epicmorg/devel/jdk7/Dockerfile @@ -14,7 +14,7 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/devel/jdk8/Dockerfile b/linux/obsolete/epicmorg/devel/jdk8/Dockerfile index 1ebcc540e..ec0f0050e 100644 --- a/linux/obsolete/epicmorg/devel/jdk8/Dockerfile +++ b/linux/obsolete/epicmorg/devel/jdk8/Dockerfile @@ -15,7 +15,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/devel/main/Dockerfile b/linux/obsolete/epicmorg/devel/main/Dockerfile index aab7e0af4..fbe260286 100644 --- a/linux/obsolete/epicmorg/devel/main/Dockerfile +++ b/linux/obsolete/epicmorg/devel/main/Dockerfile @@ -107,8 +107,8 @@ RUN curl -s ${NINJA_RELEASE_URL} | jq -r ".assets[] | select(.name | test(\"${NI ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/obsolete/epicmorg/edge/jdk11/Dockerfile b/linux/obsolete/epicmorg/edge/jdk11/Dockerfile index 425889e04..97a146dec 100644 --- a/linux/obsolete/epicmorg/edge/jdk11/Dockerfile +++ b/linux/obsolete/epicmorg/edge/jdk11/Dockerfile @@ -18,7 +18,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/edge/jdk16/Dockerfile b/linux/obsolete/epicmorg/edge/jdk16/Dockerfile index ba522d209..4e6bcaf79 100644 --- a/linux/obsolete/epicmorg/edge/jdk16/Dockerfile +++ b/linux/obsolete/epicmorg/edge/jdk16/Dockerfile @@ -18,7 +18,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/edge/jdk6/Dockerfile b/linux/obsolete/epicmorg/edge/jdk6/Dockerfile index 8265332a1..99a570f9e 100644 --- a/linux/obsolete/epicmorg/edge/jdk6/Dockerfile +++ b/linux/obsolete/epicmorg/edge/jdk6/Dockerfile @@ -14,7 +14,7 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/edge/jdk7/Dockerfile b/linux/obsolete/epicmorg/edge/jdk7/Dockerfile index c86cf5095..9e95b9f8d 100644 --- a/linux/obsolete/epicmorg/edge/jdk7/Dockerfile +++ b/linux/obsolete/epicmorg/edge/jdk7/Dockerfile @@ -14,7 +14,7 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/edge/jdk8/Dockerfile b/linux/obsolete/epicmorg/edge/jdk8/Dockerfile index a4c485c7e..26d694176 100644 --- a/linux/obsolete/epicmorg/edge/jdk8/Dockerfile +++ b/linux/obsolete/epicmorg/edge/jdk8/Dockerfile @@ -15,7 +15,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/edge/main/Dockerfile b/linux/obsolete/epicmorg/edge/main/Dockerfile index df4b927c7..cffab0a81 100644 --- a/linux/obsolete/epicmorg/edge/main/Dockerfile +++ b/linux/obsolete/epicmorg/edge/main/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/prod/jdk11/Dockerfile b/linux/obsolete/epicmorg/prod/jdk11/Dockerfile index bb41c6bca..d37cc1a64 100644 --- a/linux/obsolete/epicmorg/prod/jdk11/Dockerfile +++ b/linux/obsolete/epicmorg/prod/jdk11/Dockerfile @@ -17,7 +17,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/prod/jdk16/Dockerfile b/linux/obsolete/epicmorg/prod/jdk16/Dockerfile index 0629832f1..868847df7 100644 --- a/linux/obsolete/epicmorg/prod/jdk16/Dockerfile +++ b/linux/obsolete/epicmorg/prod/jdk16/Dockerfile @@ -17,7 +17,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/prod/jdk6/Dockerfile b/linux/obsolete/epicmorg/prod/jdk6/Dockerfile index 7c123b399..0c07a25bd 100644 --- a/linux/obsolete/epicmorg/prod/jdk6/Dockerfile +++ b/linux/obsolete/epicmorg/prod/jdk6/Dockerfile @@ -14,7 +14,7 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/prod/jdk7/Dockerfile b/linux/obsolete/epicmorg/prod/jdk7/Dockerfile index 4097d892a..99b18e1ce 100644 --- a/linux/obsolete/epicmorg/prod/jdk7/Dockerfile +++ b/linux/obsolete/epicmorg/prod/jdk7/Dockerfile @@ -14,7 +14,7 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/prod/jdk8/Dockerfile b/linux/obsolete/epicmorg/prod/jdk8/Dockerfile index 4a556bb7e..7858cc9f1 100644 --- a/linux/obsolete/epicmorg/prod/jdk8/Dockerfile +++ b/linux/obsolete/epicmorg/prod/jdk8/Dockerfile @@ -14,7 +14,7 @@ RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | a ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/obsolete/epicmorg/prod/main/Dockerfile b/linux/obsolete/epicmorg/prod/main/Dockerfile index 9df573001..f67e0564d 100644 --- a/linux/obsolete/epicmorg/prod/main/Dockerfile +++ b/linux/obsolete/epicmorg/prod/main/Dockerfile @@ -194,8 +194,8 @@ RUN wget -nv --random-wait -c -O /tmp/lazygit.tar.xz ${LAZYGIT_DOWNLOAD_URL} && ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/1.0/Dockerfile b/linux/obsolete/freegpt-webui/1.0/Dockerfile index c75745958..78ae6f12d 100644 --- a/linux/obsolete/freegpt-webui/1.0/Dockerfile +++ b/linux/obsolete/freegpt-webui/1.0/Dockerfile @@ -56,9 +56,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/1.1/Dockerfile b/linux/obsolete/freegpt-webui/1.1/Dockerfile index e227d4fda..43591c683 100644 --- a/linux/obsolete/freegpt-webui/1.1/Dockerfile +++ b/linux/obsolete/freegpt-webui/1.1/Dockerfile @@ -56,9 +56,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/1.2/Dockerfile b/linux/obsolete/freegpt-webui/1.2/Dockerfile index 9e86f2f84..fffabfa09 100644 --- a/linux/obsolete/freegpt-webui/1.2/Dockerfile +++ b/linux/obsolete/freegpt-webui/1.2/Dockerfile @@ -56,9 +56,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/1.3.1/Dockerfile b/linux/obsolete/freegpt-webui/1.3.1/Dockerfile index 7a49762e3..781b93261 100644 --- a/linux/obsolete/freegpt-webui/1.3.1/Dockerfile +++ b/linux/obsolete/freegpt-webui/1.3.1/Dockerfile @@ -58,9 +58,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/1.3.2/Dockerfile b/linux/obsolete/freegpt-webui/1.3.2/Dockerfile index 0a98b8d2f..27db2e51d 100644 --- a/linux/obsolete/freegpt-webui/1.3.2/Dockerfile +++ b/linux/obsolete/freegpt-webui/1.3.2/Dockerfile @@ -58,9 +58,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/1.3/Dockerfile b/linux/obsolete/freegpt-webui/1.3/Dockerfile index 462571045..2d33b30fe 100644 --- a/linux/obsolete/freegpt-webui/1.3/Dockerfile +++ b/linux/obsolete/freegpt-webui/1.3/Dockerfile @@ -58,9 +58,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/1.4/Dockerfile b/linux/obsolete/freegpt-webui/1.4/Dockerfile index cd0292804..9bdadac75 100644 --- a/linux/obsolete/freegpt-webui/1.4/Dockerfile +++ b/linux/obsolete/freegpt-webui/1.4/Dockerfile @@ -58,9 +58,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/freegpt-webui/latest/Dockerfile b/linux/obsolete/freegpt-webui/latest/Dockerfile index 3ccd2a369..f553266b2 100644 --- a/linux/obsolete/freegpt-webui/latest/Dockerfile +++ b/linux/obsolete/freegpt-webui/latest/Dockerfile @@ -56,9 +56,9 @@ COPY --from=build /app ${FREEGPT_PATH} ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ - apt-get clean all && \ - apt autoclean -y && \ +RUN apt-get clean -y && \ + apt-get clean all -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /root/tmp/* && \ diff --git a/linux/obsolete/gitlab/runner/atlassian-sdk/Dockerfile b/linux/obsolete/gitlab/runner/atlassian-sdk/Dockerfile deleted file mode 100644 index 7641e2953..000000000 --- a/linux/obsolete/gitlab/runner/atlassian-sdk/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# teamcity atlassian-sdk setup -################################################################## - -#Install packages -#RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contrib/a/atlassian-plugin-sdk/atlassian-plugin-sdk_8.0.16_all.deb -o /tmp/atlassian-plugin-sdk.deb && \ -# dpkg -i /tmp/atlassian-plugin-sdk.deb - -############################### -# https://community.atlassian.com/t5/Continuous-Delivery-questions/The-repository-https-packages-atlassian-com-atlassian-sdk-deb/qaq-p/1334014 -# -# https://community.developer.atlassian.com/t/the-repository-https-packages-atlassian-com-atlassian-sdk-deb-stable-release-is-not-signed/36901 -############################### -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 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/obsolete/gitlab/runner/atlassian-sdk/README.md b/linux/obsolete/gitlab/runner/atlassian-sdk/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/atlassian-sdk/apt/keyrings/atlassian.asc b/linux/obsolete/gitlab/runner/atlassian-sdk/apt/keyrings/atlassian.asc deleted file mode 100644 index c906eb35f..000000000 --- a/linux/obsolete/gitlab/runner/atlassian-sdk/apt/keyrings/atlassian.asc +++ /dev/null @@ -1,86 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFjI3poBEADZReqFbIKxXzliXUM5YbEdd/pf2qzwltNYx4BenJELhEaGUXCL -kTu30cfQdLpzhqixd4sKwzcBtrA7F2bP8Xzu1Te1F3P0tL6DHuczgpoqG04nZZLA -8bBj4tfYeNv0YpXfKhFyHHUbXD3ZFHL71AF8O0G7U9mNFyKK1JL4sNMHnleI5tWU -rkXtpUbSCFIZx5qdh2dcmwEob6F0AfM+097fVGe5KC8JAzT81tr5mEp4G0orzkUW -Yi17jce2RC6def12aebPXAeYJlyXaKdssktqVnlz0Q9kDFys34ugyVzroQ41a9Rl -zrZ6NLknVYxSgdePTo2ys54wJi3TujWDuKCoiMJZ06Rh/WQxBz+WnYPwqmsftlMz -lVWPtL2SY4jJhoDtQl6LQjPd3jMPolWzxXlvGer+xo3hS8FwLAxzcWp5zRS5Fhum -6w0xYhtQJgqeiwaT1e5V31d6UektD1UayCg/GtFC3M1tPYI69X7aS2VhlYql7Gv/ -CGC0wZCfuJ6C8xHlxROlbYPZ9oEkaiE6cFmzWfVLtr1stO+8fiEgsJMS+tCaNwhd -LzkNnxIt8xN/CftuIE2YhwcxzAizfL7IcvoeNz6LlrdJWDntcs49GFqfWoNW7M6K -UjWnnZBTr8thGZOl8OB3KKZjM2bn5V9vI4fQ/S9v+NiU4Y6LRlcIbaIwiQARAQAB -tGJCdWlsZCBFbmdpbmVlcmluZyBUZWFtIChHUEcga2V5IHRvIHNpZ24gQXRsYXNz -aWFuIGRlYmlhbi95dW0gYXJ0aWZhY3RzKSA8YnVpbGQtdGVhbUBhdGxhc3NpYW4u -Y29tPokCOQQTAQgAIwUCWMjemgIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheA -AAoJELVslWWVdJW5DkoQAJpIzmjLGpqAO0PcCtmSMtvVIAnXQEFgKY1DTp7yfMdz -VdR3S58GVepWIUSZiVAPfzrpX6J7Nfeb4HUivGb89wxSLPgP+3RByVaW3hwh11H8 -SuO7q3rGAaT2DQUSafvdw9O22ssLrqmnV3LkLhF045XUv6Qrma88SQVCm8XpZ7JY -Cvaobz0083/mIQI3DjFMj7J69QpshVjcJnV9bRQrHAhF11eGCgOT9t7w4Iw35iqM -assSFihUNoVyWd6B+lrdY0yloqIMwXZT3Y+2F5J5IYzSQL8j6uBDWww/hfJL8iZC -k7kNZRvnyEfxBV2mQViawy42rTw9CpXpLwiNonWm871UEpr4P0OnAH1oqLdDbOO5 -XBmpDDoGorBzZ9cyWYWsh7o3aHwPjidwbBi+Wlm1DdbLNt4nbkovXEzvo1anyP8C -lnb0aayFugJvwZCWIINhXl2pMy8LD0cIsJ5u+lUlteiNqJHrNsEs5L/RqUT2/oJE -rQhoNDD45bi09RDijsErBH+0jmTJCA/Y/QF0aBIHMnUW/QJfTJtnKltt+kUinPwX -CBTpsXhFYhpPgC1RBZjeVEwNU3+JfWyvRVihG/bl+hhOxlRqecHzDsobdb94G+Pk -D+ik8CspQ35/w/VizNgiW/CCWOap2F7+AXkEWOFek0BdrvptTs9YpHXtLmLuQgAM -uQINBFjI3poBEADGFarW4ZTrWpb6jj6xNnkMYHbd+Fl90hNDumHQmNwyv4iDYto0 -p+CWng0ocSbN8LylKE+c/kFBvWOuDVxtosLt4RCbF5SLK3/kKND1y1XRnya3bOax -atA4U9vfcAxfoAp+7NXANi9gCWMr1rWvd6tKVYSTuG9EoFJWXtUsAeyUYEtbXwrn -zor70WI4j6GJnlnH35viIDMxkaBreKbcYkun3xa/3uzQxg620tcgqjsCKrcXxNMZ -tH3bnYsDinL3ikwSMU/uylzcq7RAU0rQ2L55us1DpOVEEFAH2vRLWcQwQYBUXGhi -0hxQJGlI5bYISTS67u5Vzlg8bPKHytAv7UZwWqEk8OhqaEWJmpoIfBz7RFALcZtg -WGrYbl22HO5zV/kf0Muh10cB8drKxk6zNl747+bQ1q7VZsZfrTU0jZd0ol/8XPmc -0uO59w514LfnUKgbgMgL2A0/TWPWJsOb/e0bPB28TdjB/QVTAED9/2B8h0w6Simo -xILWXG3po3VS3BZWpxH6bADNEoHFJsI37/T4LsjvlQgdk/9bUx9CKiOm6jKaHIqv -Y1ow5qsF58841e8Y09Kf93FooOtgl3tUUszuE2dY+3zyFcMeeySjreEUJTZR218d -u0yT1PbMEX0s8uO6IbXJ8diBU/iDfGoZpB/LnTPXLNGf5JSpoqOQqLntywARAQAB -iQIfBBgBCAAJBQJYyN6aAhsMAAoJELVslWWVdJW5O1gP/2rX+yWB/QcROXN0ZmMB -Tg4VU0X6TZMsp2cbkPBxcqLEumc3LGqM3IQdEuHiv3pjkq0CzrIT73YWD+86JRT1 -HS51mhMLUkw6WkqjWf5+ODzjLzqXt6oUEmSUBNR5gpIKCjOswXkqB5LJBanR7YS6 -fC+/BQLdLh8sQ9hJw3T6aABp/Yf0dEFEmZLL/r7DF1wZdg6qfSeukU6f8b0uo9un -fGCDn3FWEh5UunJ1Xxh+DnttnYRMkhvI3jIls7D8KggMhixdiFCMnuVtIzecyuU7 -jQBhQDwVkAtnIRex/pw4iv2J73q+YekEwI8IERykwaYuqM101QEbpMik9xtCPdoW -Nd5cXAx6WFsT6eeWe6NE5CphSATuhi7qRL3wScjT+OqoHX3Xr3QXXrBbQw5BR6R8 -YNPyev4ihuEArFml8gpXxYFN1CQBp/lfShzG4goLYji9xNGvr6r/mfADacI5CRQ9 -t7LSMJH+1ho3hrIBqF6oNjYyjOrvjMaNTMyS3Bq/2dCu29/083IZqFT4Uj30vYsN -49rXkC5M5DdCw1MhH10L9zrEswITMngNdWFT/LYXeeBvp7RvWG9AwWFguyMxbcmG -tvgk2bSRLlKcoQ78FKzmwhfe0NVg/5R9kTn45eU9RLIASgDnyaOw8EEbE3f6NiaJ -rbchfSKPy38kdMCUZcOHnAJDuQINBFjI3zMBEACtfn1/0UzrSZAVTbuCtTmNQ5J4 -Cq3JwS99rKFVmDAyKGHHKMaV39B14AoJTKXRGFI5CQSRV1dETu9K+0Gvv8AkjDcJ -3+ROpBJBqsPTrLmFoQxImoEZ1tki2kyYeGXlXmOe1VMxU3gRip4gzXGH5WGSIa/h -ydLXm1CkG0Uzczgf79Hes3XMDiQ8qgFuO/C0r08yeEfkzY7j55FZOS7j7Qltk5yU -pnU8fgDcZbBPfuo/YlEyalW3BC6ELMXDPY61g1AGmfbEboKa1xBiE32v0J9zj1QR -rsHxzmZZ65QbpONpJIyrop4WMXQURFd+r76FfpQBoSHg050iSWTDV8ySYk4V9LBU -5BYnIvu5pSjK2Qy25EfW3g5RCIeTScAXzslPwizIvkB97OfFb9krCGslX82bMRjA -tNN7abeQ8DVgxKAvVz7OxKpgPPS61+wnNdeNQYLVr6ckVYmfusO7wNdPBIixhaYQ -n1wZxnYhVdO538sq0g/tbFf87R1Ygx9S5CsHvbdr6oMk9oxFiwvaYwpiNhRa3k5k -KK2vSfqTqQyV6n+nFptyrpWw65plhbFtrAw6Mk/dfsev24HYOcc+FQ9fo7CaVh7q -hFj/AmVmeJXPfrKzWuQWBv6I35TXZpcS5bDjUerhjCFa/I3cy3AH8wpf9vZBwMLc -HI8TlGMgKQzDFbMSvwARAQABiQQ+BBgBCAAJBQJYyN8zAhsCAikJELVslWWVdJW5 -wV0gBBkBCAAGBQJYyN8zAAoJEDYLQ+tLJdhXPOYP/RSEpD9d+hT003v4GIBl/6dW -ObQ/inVPTE2J4xnl5VSFGFLLuC+Rto6eGswDqpDWRYmnLctEUUFdkNvE+bQu4BIF -F6jR5Gn8qm1Ou1xisVFIEHIkNgoinIs7BCVlzCreGL0TIsPEpB2mRdD/ayr3OsZW -evJ7qXOMR+kiQ1d2kiGC6YAHT8cyb0R407gZSTGYtmHfuZ7aiE1DhSOD1bOiiYKY -K4FlY0a/U9JPdDHM9y4dHMblv+yQwcPbb2+oLEEuYcqnX3unLq58TR8betzNFwJ4 -iNdEb3UqPpg6o5U1RFbSCHzScal8Ly9mkzp1IC+kST35PTLP6oPgtdBkxQqGwtV9 -B2OOJPZGnhNVjjAMEhDfMHSHAaH2hpxZvH3tvlJjAayalANWGb4iUgjTIZ0Auoy8 -agCjdEKhcCfqwTMSf3++b1bY/5/aGT6FAvhHWjSOGoBaTXH+pXxCCEsRBThELjMo -hTNjGSIS3tnyJK+NpMoZm1evBTCz/fWTmGseY9PrH3P4vXtIzH8ImTAmvQX/EIHL -Nnm6VoSjM1EdgeVHN8mfeVSqoC/yWMvwVqyzxG+rfwhAvRYseK5RDS5ErIM/FPT/ -zHaMn3FJhBBHzhaw8vAQKpbufc/fe35MujHvwRHQsoWRIysDWHC+7D+adAPzQuEO -gYYYLD0avCsKaoRJ1uErE9MP/2f9+ZONtSy3W4InlhTl+N6G547bdiQbTvdqoFMe -ec0K8NowBFhul/j5AUBbW2snAN8j9REYigQZrestVazsQPwdEFtog99N6hKRSV/u -xBGgx3Fx643wQez4JYOA0qxub4qeHfIc9yPecHjuz5qD4yFI/nR869VXLkhlBleE -gw9MDgtrc0Syqc1pr5/EKih8ZRHAWzNGpdKhXN5+1hwpPlmq3pp2hsZDgJ/Qi9yx -r6cRIHLIKOCqWioJtbZod+Ish+m2KzcUZryQkRYXCe+JEID3ibx74ZkWbGJ63JUw -px59x7XAalTayA8EUCc+1fyNS1bA/0K0Nob7ZXfy+wAPIl5X0TQ5FSh6rvPTnVL/ -Yk8SHQPTrxr/i9Buaub3PyOA9p6c72mCsElppOj2gQAu+xHdolgaLJRlLsEWj+9g -Kg/mas08V3dW34+jE8Z/6wa1BP3pGBJODhOgpAN4A8dbryqMVTYFVUvRPNLnU2Ue -/BcvqaDwTA6Ir/6UveQHPDGaLd14btuRjvnggNygrmxD7uZbs8+h6I6Hgu5jBZ5U -or+44YpIO3VkO2BWPVq2rJ124DuN5l5j2jpYrUP+FKaJh4Mj9WOih+DBi3WeXEeI -54iajRX5eeLQu895qRIobak4Uht+590qxO1HFY0AwllgRJTFZUVUfEr8cN2YdzX4 -EncZ -=/56f ------END PGP PUBLIC KEY BLOCK----- diff --git a/linux/obsolete/gitlab/runner/atlassian-sdk/apt/sources.list.d/atlassian-sdk.list b/linux/obsolete/gitlab/runner/atlassian-sdk/apt/sources.list.d/atlassian-sdk.list deleted file mode 100644 index 5b81e45ad..000000000 --- a/linux/obsolete/gitlab/runner/atlassian-sdk/apt/sources.list.d/atlassian-sdk.list +++ /dev/null @@ -1 +0,0 @@ -deb [trusted=yes signed-by=/etc/apt/keyrings/atlassian.asc] https://packages.atlassian.com/atlassian-sdk-deb stable contrib diff --git a/linux/obsolete/gitlab/runner/dotnet-sdk/Dockerfile b/linux/obsolete/gitlab/runner/dotnet-sdk/Dockerfile deleted file mode 100644 index 6b4537e5a..000000000 --- a/linux/obsolete/gitlab/runner/dotnet-sdk/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -FROM hub.epicm.org/epicmorg/gitlab-runner:latest -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# teamcity dotnet setup -################################################################## -# Opt out of the telemetry feature -ENV DOTNET_CLI_TELEMETRY_OPTOUT=true -# Disable first time experience -ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -# Configure Kestrel web server to bind to port 80 when present -ENV ASPNETCORE_URLS=\ -# Enable detection of running in a container -ENV DOTNET_RUNNING_IN_CONTAINER=true -# Enable correct mode for dotnet watch (only mode supported in a container) -ENV DOTNET_USE_POLLING_FILE_WATCHER=true -# Skip extraction of XML docs - generally not useful within an image/container - helps perfomance -ENV NUGET_XMLDOC_MODE=skip -#unofficial support of openssl1.1 instead of 1.0 [https://stackoverflow.com/questions/51901359] -ENV CLR_OPENSSL_VERSION_OVERRIDE=45 -# PowerShell telemetry for docker image usage -ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-10 - -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 -################################################################## -#RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ -# echo "deb https://download.mono-project.com/repo/debian stable-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ -# echo "deb https://download.mono-project.com/repo/debian nightly-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ -# echo "deb https://download.mono-project.com/repo/debian preview-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ -# apt-get update && \ -# apt-get install -y --allow-unauthenticated \ -# mono-complete \ -# mono-llvm-support \ -# mono-devel \ -# mono-dbg \ -# referenceassemblies-pcl \ -# ca-certificates-mono -# mono-xsp4 - -################################################################## -# Cleanup -################################################################## -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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/obsolete/gitlab/runner/dotnet-sdk/README.md b/linux/obsolete/gitlab/runner/dotnet-sdk/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/dotnet-sdk/docker-compose.yml b/linux/obsolete/gitlab/runner/dotnet-sdk/docker-compose.yml deleted file mode 100644 index 7ee0d89c2..000000000 --- a/linux/obsolete/gitlab/runner/dotnet-sdk/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - app: - image: "hub.epicm.org/epicmorg/teamcity-agent:dotnet-sdk" - build: - context: . diff --git a/linux/obsolete/gitlab/runner/php7.2/Dockerfile b/linux/obsolete/gitlab/runner/php7.2/Dockerfile deleted file mode 100644 index af7152d70..000000000 --- a/linux/obsolete/gitlab/runner/php7.2/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.2 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - -################################################################## -# docker setup -################################################################## - -#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 && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - docker-ce \ - docker-ce-cli \ - containerd.io systemd && \ - systemctl disable docker && \ - docker --version - -COPY run-docker.sh /services/run-docker.sh -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ - echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ - curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version - -################################################################## -# 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 && \ - usermod -aG docker gitlab-runner && \ - cat /etc/passwd && \ - gitlab-runner --version - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker"] -WORKDIR /home/gitlab-runner - -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh - -RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] diff --git a/linux/obsolete/gitlab/runner/php7.2/README.md b/linux/obsolete/gitlab/runner/php7.2/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/php7.2/docker-entrypoint.sh b/linux/obsolete/gitlab/runner/php7.2/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/obsolete/gitlab/runner/php7.2/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/obsolete/gitlab/runner/php7.2/install-gitlab-runner.sh b/linux/obsolete/gitlab/runner/php7.2/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/obsolete/gitlab/runner/php7.2/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/obsolete/gitlab/runner/php7.2/run-docker.sh b/linux/obsolete/gitlab/runner/php7.2/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/obsolete/gitlab/runner/php7.2/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/obsolete/gitlab/runner/php7.3/Dockerfile b/linux/obsolete/gitlab/runner/php7.3/Dockerfile deleted file mode 100644 index 144b60a74..000000000 --- a/linux/obsolete/gitlab/runner/php7.3/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.3 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - -################################################################## -# docker setup -################################################################## - -#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 && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - docker-ce \ - docker-ce-cli \ - containerd.io systemd && \ - systemctl disable docker && \ - docker --version - -COPY run-docker.sh /services/run-docker.sh -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ - echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ - curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version - -################################################################## -# 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 && \ - usermod -aG docker gitlab-runner && \ - cat /etc/passwd && \ - gitlab-runner --version - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker"] -WORKDIR /home/gitlab-runner - -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh - -RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] diff --git a/linux/obsolete/gitlab/runner/php7.3/README.md b/linux/obsolete/gitlab/runner/php7.3/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/php7.3/docker-entrypoint.sh b/linux/obsolete/gitlab/runner/php7.3/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/obsolete/gitlab/runner/php7.3/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/obsolete/gitlab/runner/php7.3/install-gitlab-runner.sh b/linux/obsolete/gitlab/runner/php7.3/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/obsolete/gitlab/runner/php7.3/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/obsolete/gitlab/runner/php7.3/run-docker.sh b/linux/obsolete/gitlab/runner/php7.3/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/obsolete/gitlab/runner/php7.3/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/obsolete/gitlab/runner/php7.4/Dockerfile b/linux/obsolete/gitlab/runner/php7.4/Dockerfile deleted file mode 100644 index a924b8cbe..000000000 --- a/linux/obsolete/gitlab/runner/php7.4/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.4 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - -################################################################## -# docker setup -################################################################## - -#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 && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - docker-ce \ - docker-ce-cli \ - containerd.io systemd && \ - systemctl disable docker && \ - docker --version - -COPY run-docker.sh /services/run-docker.sh -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ - echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ - curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version - -################################################################## -# 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 && \ - usermod -aG docker gitlab-runner && \ - cat /etc/passwd && \ - gitlab-runner --version - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker"] -WORKDIR /home/gitlab-runner - -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh - -RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] - diff --git a/linux/obsolete/gitlab/runner/php7.4/README.md b/linux/obsolete/gitlab/runner/php7.4/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/php7.4/docker-entrypoint.sh b/linux/obsolete/gitlab/runner/php7.4/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/obsolete/gitlab/runner/php7.4/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/obsolete/gitlab/runner/php7.4/install-gitlab-runner.sh b/linux/obsolete/gitlab/runner/php7.4/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/obsolete/gitlab/runner/php7.4/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/obsolete/gitlab/runner/php7.4/run-docker.sh b/linux/obsolete/gitlab/runner/php7.4/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/obsolete/gitlab/runner/php7.4/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/obsolete/gitlab/runner/php8.0/Dockerfile b/linux/obsolete/gitlab/runner/php8.0/Dockerfile deleted file mode 100644 index 714843710..000000000 --- a/linux/obsolete/gitlab/runner/php8.0/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.0 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - -################################################################## -# docker setup -################################################################## - -#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 && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - docker-ce \ - docker-ce-cli \ - containerd.io systemd && \ - systemctl disable docker && \ - docker --version - -COPY run-docker.sh /services/run-docker.sh -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ - echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ - curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version - -################################################################## -# 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 && \ - usermod -aG docker gitlab-runner && \ - cat /etc/passwd && \ - gitlab-runner --version - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker"] -WORKDIR /home/gitlab-runner - -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh - -RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] - diff --git a/linux/obsolete/gitlab/runner/php8.0/README.md b/linux/obsolete/gitlab/runner/php8.0/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/php8.0/docker-entrypoint.sh b/linux/obsolete/gitlab/runner/php8.0/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/obsolete/gitlab/runner/php8.0/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/obsolete/gitlab/runner/php8.0/install-gitlab-runner.sh b/linux/obsolete/gitlab/runner/php8.0/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/obsolete/gitlab/runner/php8.0/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/obsolete/gitlab/runner/php8.0/run-docker.sh b/linux/obsolete/gitlab/runner/php8.0/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/obsolete/gitlab/runner/php8.0/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/obsolete/gitlab/runner/php8.1/Dockerfile b/linux/obsolete/gitlab/runner/php8.1/Dockerfile deleted file mode 100644 index c16912674..000000000 --- a/linux/obsolete/gitlab/runner/php8.1/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.1 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - -################################################################## -# docker setup -################################################################## - -#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 && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - docker-ce \ - docker-ce-cli \ - containerd.io systemd && \ - systemctl disable docker && \ - docker --version - -COPY run-docker.sh /services/run-docker.sh -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ - echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ - curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version - -################################################################## -# 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 && \ - usermod -aG docker gitlab-runner && \ - cat /etc/passwd && \ - gitlab-runner --version - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker"] -WORKDIR /home/gitlab-runner - -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh - -RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] diff --git a/linux/obsolete/gitlab/runner/php8.1/README.md b/linux/obsolete/gitlab/runner/php8.1/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/php8.1/docker-entrypoint.sh b/linux/obsolete/gitlab/runner/php8.1/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/obsolete/gitlab/runner/php8.1/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/obsolete/gitlab/runner/php8.1/install-gitlab-runner.sh b/linux/obsolete/gitlab/runner/php8.1/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/obsolete/gitlab/runner/php8.1/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/obsolete/gitlab/runner/php8.1/run-docker.sh b/linux/obsolete/gitlab/runner/php8.1/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/obsolete/gitlab/runner/php8.1/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/obsolete/gitlab/runner/php8.2/Dockerfile b/linux/obsolete/gitlab/runner/php8.2/Dockerfile deleted file mode 100644 index 6e0af14e3..000000000 --- a/linux/obsolete/gitlab/runner/php8.2/Dockerfile +++ /dev/null @@ -1,86 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.2 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - -################################################################## -# docker setup -################################################################## - -#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 && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - docker-ce \ - docker-ce-cli \ - containerd.io systemd && \ - systemctl disable docker && \ - docker --version - -COPY run-docker.sh /services/run-docker.sh -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ - echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ - curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version - -################################################################## -# 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 && \ - usermod -aG docker gitlab-runner && \ - cat /etc/passwd && \ - gitlab-runner --version - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker"] -WORKDIR /home/gitlab-runner - -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh - -RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] - - diff --git a/linux/obsolete/gitlab/runner/php8.2/README.md b/linux/obsolete/gitlab/runner/php8.2/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/php8.2/docker-entrypoint.sh b/linux/obsolete/gitlab/runner/php8.2/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/obsolete/gitlab/runner/php8.2/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/obsolete/gitlab/runner/php8.2/install-gitlab-runner.sh b/linux/obsolete/gitlab/runner/php8.2/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/obsolete/gitlab/runner/php8.2/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/obsolete/gitlab/runner/php8.2/run-docker.sh b/linux/obsolete/gitlab/runner/php8.2/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/obsolete/gitlab/runner/php8.2/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/obsolete/gitlab/runner/php8.3/Dockerfile b/linux/obsolete/gitlab/runner/php8.3/Dockerfile deleted file mode 100644 index e9ce4d13a..000000000 --- a/linux/obsolete/gitlab/runner/php8.3/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.3 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - -ENV GITLAB_RUNNER_HOME=/home/gitlab-runner -ENV GITLAB_RUNNER_CONF=/etc/gitlab-runner -ENV GIT_SSH_VARIANT=ssh -RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ - chmod -R 700 /etc/gitlab-runner - -################################################################## -# docker setup -################################################################## - -#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 && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - docker-ce \ - docker-ce-cli \ - containerd.io systemd && \ - systemctl disable docker && \ - docker --version - -COPY run-docker.sh /services/run-docker.sh -RUN chmod +x /services/run-docker.sh && \ - sync - -################################################################## -# docker compose setup -################################################################## - -#Install packages -RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \ - echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \ - curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ - docker-compose --version - -################################################################## -# 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 && \ - usermod -aG docker gitlab-runner && \ - cat /etc/passwd && \ - gitlab-runner --version - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -#Final config -STOPSIGNAL SIGQUIT -VOLUME ["${GITLAB_RUNNER_CONF}", "/home/gitlab-runner", "/var/lib/docker"] -WORKDIR /home/gitlab-runner - -# Add image configuration and scripts -COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh -RUN chmod 755 /usr/bin/docker-entrypoint.sh - -RUN updatedb - -ENTRYPOINT ["/usr/bin/dumb-init", "docker-entrypoint.sh"] -CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"] diff --git a/linux/obsolete/gitlab/runner/php8.3/README.md b/linux/obsolete/gitlab/runner/php8.3/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/linux/obsolete/gitlab/runner/php8.3/docker-entrypoint.sh b/linux/obsolete/gitlab/runner/php8.3/docker-entrypoint.sh deleted file mode 100755 index 53350fa8f..000000000 --- a/linux/obsolete/gitlab/runner/php8.3/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# gitlab-runner data directory -DATA_DIR="/etc/gitlab-runner" -CONFIG_FILE=${CONFIG_FILE:-$DATA_DIR/config.toml} -# custom certificate authority path -CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt} -LOCAL_CA_PATH="/usr/local/share/ca-certificates/ca.crt" - -update_ca() { - echo "Updating CA certificates..." - cp "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" - update-ca-certificates --fresh >/dev/null -} - -if [ -f "${CA_CERTIFICATES_PATH}" ]; then - # update the ca if the custom ca is different than the current - cmp --silent "${CA_CERTIFICATES_PATH}" "${LOCAL_CA_PATH}" || update_ca -fi - -# launch gitlab-runner passing all arguments -exec gitlab-runner "$@" diff --git a/linux/obsolete/gitlab/runner/php8.3/install-gitlab-runner.sh b/linux/obsolete/gitlab/runner/php8.3/install-gitlab-runner.sh deleted file mode 100755 index 833bf928e..000000000 --- a/linux/obsolete/gitlab/runner/php8.3/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/obsolete/gitlab/runner/php8.3/run-docker.sh b/linux/obsolete/gitlab/runner/php8.3/run-docker.sh deleted file mode 100755 index 41b5e68e5..000000000 --- a/linux/obsolete/gitlab/runner/php8.3/run-docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$DOCKER_IN_DOCKER" = "start" ] ; then - rm /var/run/docker.pid 2>/dev/null - service docker start - echo "Docker daemon started" -fi diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk11/Dockerfile b/linux/obsolete/teamcity/agent/android-sdk/jdk11/Dockerfile deleted file mode 100644 index 2e821c34e..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk11/Dockerfile +++ /dev/null @@ -1,560 +0,0 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest-jdk11 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk - -ENV PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin - -################################################################## -# Android SDK -################################################################## -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - android-sdk \ - sdkmanager \ - android-sdk-build-tools \ - android-sdk-platform-tools-common \ - android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ - apt remove -y gradle && \ - sdkmanager --version && \ - mvn -v - -# Install ALL ANDROID SDK -RUN sdkmanager --install \ -# "build-tools;17.0.0" \ -# "build-tools;18.0.0" \ -# "build-tools;18.0.1" \ -# "build-tools;18.1.0" \ -# "build-tools;18.1.1" \ -# "build-tools;19.0.0" \ -# "build-tools;19.0.1" \ -# "build-tools;19.0.2" \ -# "build-tools;19.0.3" \ -# "build-tools;19.1.0" \ -# "build-tools;20.0.0" \ -# "build-tools;21.0.0" \ -# "build-tools;21.0.1" \ -# "build-tools;21.0.2" \ -# "build-tools;21.1.0" \ -# "build-tools;21.1.1" \ -# "build-tools;21.1.2" \ -# "build-tools;22.0.0" \ -# "build-tools;22.0.1" \ -# "build-tools;23.0.0" \ -# "build-tools;23.0.1" \ -# "build-tools;23.0.2" \ -# "build-tools;23.0.3" \ -# "build-tools;24.0.0" \ -# "build-tools;24.0.1" \ -# "build-tools;24.0.2" \ -# "build-tools;24.0.3" \ -# "build-tools;25.0.0" \ -# "build-tools;25.0.1" \ -# "build-tools;25.0.2" \ -# "build-tools;25.0.3" \ -# "build-tools;26.0.0" \ -# "build-tools;26.0.0-rc1" \ -# "build-tools;26.0.0-rc2" \ -# "build-tools;26.0.1" \ -# "build-tools;26.0.2" \ -# "build-tools;26.0.3" \ -# "build-tools;27.0.0" \ -# "build-tools;27.0.1" \ -# "build-tools;27.0.2" \ -# "build-tools;27.0.3" \ -# "build-tools;28.0.0" \ -# "build-tools;28.0.0-rc1" \ -# "build-tools;28.0.0-rc2" \ -# "build-tools;28.0.1" \ -# "build-tools;28.0.2" \ -# "build-tools;28.0.3" \ -# "build-tools;29.0.0" \ -# "build-tools;29.0.0-rc1" \ -# "build-tools;29.0.0-rc2" \ -# "build-tools;29.0.0-rc3" \ -# "build-tools;29.0.1" \ -# "build-tools;29.0.2" \ -# "build-tools;29.0.3" \ -# "build-tools;30.0.0" \ -# "build-tools;30.0.0-rc1" \ -# "build-tools;30.0.0-rc2" \ -# "build-tools;30.0.0-rc3" \ -# "build-tools;30.0.0-rc4" \ -# "build-tools;30.0.1" \ -# "build-tools;30.0.2" \ -# "build-tools;30.0.3" \ -# "build-tools;31.0.0" \ -# "build-tools;31.0.0-rc1" \ -# "build-tools;31.0.0-rc2" \ -# "build-tools;31.0.0-rc3" \ -# "build-tools;31.0.0-rc4" \ -# "build-tools;31.0.0-rc5" \ -# "build-tools;32.0.0" \ -# "build-tools;32.1.0-rc1" \ -# "build-tools;33.0.0" \ -# "build-tools;33.0.0-rc1" \ -# "build-tools;33.0.0-rc2" \ -# "build-tools;33.0.0-rc3" \ -# "build-tools;33.0.0-rc4" \ -# "build-tools;33.0.1" \ -# "build-tools;33.0.2" \ -# "build-tools;34.0.0" \ -# "build-tools;34.0.0-rc1" \ -# "build-tools;34.0.0-rc2" \ -# "build-tools;34.0.0-rc3" \ - "build-tools;34.0.0-rc4" - -RUN sdkmanager --install \ - "cmake;3.10.2.4988404" \ - "cmake;3.18.1" \ - "cmake;3.22.1" \ - "cmake;3.6.4111459" - -RUN sdkmanager --install \ -# "cmdline-tools;1.0" \ -# "cmdline-tools;1.0-alpha01" \ -# "cmdline-tools;10.0-beta04" \ -# "cmdline-tools;11.0-alpha07" \ -# "cmdline-tools;2.0" \ -# "cmdline-tools;2.0-rc01" \ -# "cmdline-tools;2.1" \ -# "cmdline-tools;3.0" \ -# "cmdline-tools;3.0-beta01" \ -# "cmdline-tools;4.0" \ -# "cmdline-tools;4.0-alpha02" \ -# "cmdline-tools;4.0-beta01" \ -# "cmdline-tools;5.0" \ -# "cmdline-tools;5.0-alpha01" \ -# "cmdline-tools;6.0" \ -# "cmdline-tools;7.0" \ -# "cmdline-tools;8.0" \ -# "cmdline-tools;9.0" \ - "cmdline-tools;latest" - -RUN sdkmanager --install \ - "extras;android;m2repository" \ -# "extras;android;m2repository;01" \ -# "extras;android;m2repository;02" \ -# "extras;android;m2repository;03" \ -# "extras;android;m2repository;04" \ -# "extras;android;m2repository;06" \ -# "extras;android;m2repository;07" \ -# "extras;android;m2repository;08" \ -# "extras;android;m2repository;09" \ -# "extras;android;m2repository;1" \ -# "extras;android;m2repository;2" \ -# "extras;android;m2repository;3" \ -# "extras;android;m2repository;4" \ -# "extras;android;m2repository;6" \ -# "extras;android;m2repository;7" \ -# "extras;android;m2repository;8" \ -# "extras;android;m2repository;9" \ -# "extras;android;m2repository;10" \ -# "extras;android;m2repository;11" \ -# "extras;android;m2repository;12" \ -# "extras;android;m2repository;13" \ -# "extras;android;m2repository;14" \ -# "extras;android;m2repository;15" \ -# "extras;android;m2repository;16" \ -# "extras;android;m2repository;17" \ -# "extras;android;m2repository;18" \ -# "extras;android;m2repository;19" \ -# "extras;android;m2repository;20" \ -# "extras;android;m2repository;21" \ -# "extras;android;m2repository;22" \ -# "extras;android;m2repository;23" \ -# "extras;android;m2repository;24" \ -# "extras;android;m2repository;25" \ -# "extras;android;m2repository;26" \ -# "extras;android;m2repository;27" \ -# "extras;android;m2repository;28" \ -# "extras;android;m2repository;29" \ -# "extras;android;m2repository;30" \ -# "extras;android;m2repository;31" \ -# "extras;android;m2repository;32" \ -# "extras;android;m2repository;33" \ -# "extras;android;m2repository;34" \ -# "extras;android;m2repository;35" \ -# "extras;android;m2repository;36" \ -# "extras;android;m2repository;37" \ -# "extras;android;m2repository;38" \ -# "extras;android;m2repository;39" \ -# "extras;android;m2repository;40" \ -# "extras;android;m2repository;41" \ -# "extras;android;m2repository;42" \ -# "extras;android;m2repository;43" \ -# "extras;android;m2repository;44" \ -# "extras;android;m2repository;45" \ -# "extras;android;m2repository;46" \ - "extras;android;m2repository;47" - -RUN sdkmanager --install \ - "platform-tools" \ -# "platform-tools;24.0.0" \ -# "platform-tools;29.0.5" \ -# "platform-tools;29.0.6" \ -# "platform-tools;30.0.0" \ -# "platform-tools;30.0.1" \ -# "platform-tools;30.0.2" \ -# "platform-tools;30.0.3" \ -# "platform-tools;30.0.4" \ -# "platform-tools;30.0.5" \ -# "platform-tools;31.0.0" \ -# "platform-tools;31.0.1" \ -# "platform-tools;31.0.2" \ -# "platform-tools;31.0.3" \ -# "platform-tools;32.0.0" \ -# "platform-tools;33.0.0" \ -# "platform-tools;33.0.1" \ -# "platform-tools;33.0.2" \ -# "platform-tools;33.0.3" \ -# "platform-tools;34.0.0" \ -# "platform-tools;34.0.1" \ - "platform-tools;34.0.3" - -RUN sdkmanager --install \ -# "platforms;android-1" \ -# "platforms;android-2" \ -# "platforms;android-3" \ -# "platforms;android-4" \ -# "platforms;android-5" \ -# "platforms;android-6" \ -# "platforms;android-7" \ -# "platforms;android-8" \ -# "platforms;android-9" \ -# "platforms;android-10" \ -# "platforms;android-11" \ -# "platforms;android-12" \ -# "platforms;android-13" \ -# "platforms;android-14" \ -# "platforms;android-15" \ -# "platforms;android-16" \ -# "platforms;android-17" \ -# "platforms;android-18" \ -# "platforms;android-19" \ -# "platforms;android-20" \ -# "platforms;android-21" \ -# "platforms;android-22" \ -# "platforms;android-23" \ -# "platforms;android-24" \ -# "platforms;android-25" \ -# "platforms;android-26" \ -# "platforms;android-27" \ -# "platforms;android-28" \ -# "platforms;android-29" \ -# "platforms;android-30" \ -# "platforms;android-31" \ -# "platforms;android-32" \ -# "platforms;android-33" \ -# "platforms;android-34" \ - "platforms;android-35" - -RUN sdkmanager --install \ -# "ndk-bundle;11.0.2655954" \ -# "ndk-bundle;11.1.2683735" \ -# "ndk-bundle;11.2.2725575" \ -# "ndk-bundle;12.0.2931149" \ -# "ndk-bundle;12.1.2977051" \ -# "ndk-bundle;13.0.3315539" \ -# "ndk-bundle;13.1.3345770" \ -# "ndk-bundle;14.0.3770861" \ -# "ndk-bundle;14.1.3816874" \ -# "ndk-bundle;15.0.4075724" \ -# "ndk-bundle;15.1.4119039" \ -# "ndk-bundle;15.2.4203891" \ -# "ndk-bundle;16.0.4442984" \ -# "ndk-bundle;16.1.4479499" \ -# "ndk-bundle;17.0.4754217" \ -# "ndk-bundle;17.1.4828580" \ -# "ndk-bundle;17.2.4988734" \ -# "ndk-bundle;18.1.5063045" \ -# "ndk-bundle;19.0.5232133" \ -# "ndk-bundle;19.1.5304403" \ -# "ndk-bundle;19.2.5345600" \ -# "ndk-bundle;20.0.5392854-beta2" \ -# "ndk-bundle;20.0.5471264-beta3" \ -# "ndk-bundle;20.0.5594570" \ -# "ndk-bundle;20.1.5948944" \ -# "ndk-bundle;21.0.6011959-beta2" \ -# "ndk-bundle;21.0.6113669" \ -# "ndk-bundle;21.1.6210238-beta1" \ -# "ndk-bundle;21.1.6273396-beta2" \ -# "ndk-bundle;21.1.6352462" \ -# "ndk-bundle;21.1.6363665-beta3" \ -# "ndk-bundle;21.2.6472646" \ -# "ndk-bundle;21.3.6528147" \ -# "ndk-bundle;21.4.7075529" \ -# "ndk-bundle;22.0.6917172-beta1" \ -# "ndk-bundle;22.0.7026061" \ -# "ndk-bundle;22.1.7171670" \ -# "ndk-bundle;23.0.7123448-beta1" \ -# "ndk-bundle;23.0.7196353-beta2" \ -# "ndk-bundle;23.0.7272597-beta3" \ -# "ndk-bundle;23.0.7344513-beta4" \ -# "ndk-bundle;23.0.7421159-beta5" \ -# "ndk-bundle;23.0.7530507-beta6" \ -# "ndk-bundle;23.0.7599858" \ -# "ndk-bundle;23.1.7779620" \ -# "ndk-bundle;23.2.8568313" \ -# "ndk-bundle;24.0.7856742-beta1" \ -# "ndk-bundle;24.0.7956693-beta2" \ -# "ndk-bundle;24.0.8079956-beta3" \ -# "ndk-bundle;24.0.8215888" \ -# "ndk-bundle;25.0.8141415-beta1" \ -# "ndk-bundle;25.0.8221429-beta2" \ -# "ndk-bundle;25.0.8355429-beta3" \ -# "ndk-bundle;25.0.8528842-beta4" \ -# "ndk-bundle;25.0.8775105" \ -# "ndk-bundle;25.1.8937393" \ - "ndk-bundle;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk-bundle;r10e" \ -# "ndk-bundle;r11" \ -# "ndk-bundle;r11b" \ -# "ndk-bundle;r11c" \ -# "ndk-bundle;r12" \ -# "ndk-bundle;r12b" \ -# "ndk-bundle;r13" \ -# "ndk-bundle;r13b" \ -# "ndk-bundle;r14" \ -# "ndk-bundle;r14b" \ -# "ndk-bundle;r15" \ -# "ndk-bundle;r15b" \ -# "ndk-bundle;r15c" \ -# "ndk-bundle;r16" \ -# "ndk-bundle;r16b" \ -# "ndk-bundle;r17" \ -# "ndk-bundle;r17b" \ -# "ndk-bundle;r17c" \ -# "ndk-bundle;r18b" \ -# "ndk-bundle;r19" \ -# "ndk-bundle;r19b" \ -# "ndk-bundle;r19c" \ -# "ndk-bundle;r20" \ -# "ndk-bundle;r20-beta2" \ -# "ndk-bundle;r20-beta3" \ -# "ndk-bundle;r20b" \ -# "ndk-bundle;r21" \ -# "ndk-bundle;r21-beta2" \ -# "ndk-bundle;r21b" \ -# "ndk-bundle;r21b-beta1" \ -# "ndk-bundle;r21b-beta2" \ -# "ndk-bundle;r21b-beta3" \ -# "ndk-bundle;r21c" \ -# "ndk-bundle;r21d" \ -# "ndk-bundle;r21e" \ -# "ndk-bundle;r22" \ -# "ndk-bundle;r22-beta1" \ -# "ndk-bundle;r22b" \ -# "ndk-bundle;r23" \ -# "ndk-bundle;r23-beta1" \ -# "ndk-bundle;r23-beta2" \ -# "ndk-bundle;r23-beta3" \ -# "ndk-bundle;r23-beta4" \ -# "ndk-bundle;r23-beta5" \ -# "ndk-bundle;r23-beta6" \ -# "ndk-bundle;r23b" \ -# "ndk-bundle;r23c" \ -# "ndk-bundle;r24" \ -# "ndk-bundle;r24-beta1" \ -# "ndk-bundle;r24-beta2" \ -# "ndk-bundle;r24-rc1" \ - "ndk-bundle;r25" \ -# "ndk-bundle;r25-beta1" \ -# "ndk-bundle;r25-beta2" \ -# "ndk-bundle;r25-beta3" \ -# "ndk-bundle;r25-beta4" \ -# "ndk-bundle;r25b" \ - "ndk-bundle;r25c" - -RUN sdkmanager --install \ -# "ndk;11.0.2655954" \ -# "ndk;11.1.2683735" \ -# "ndk;11.2.2725575" \ -# "ndk;12.0.2931149" \ -# "ndk;12.1.2977051" \ -# "ndk;13.0.3315539" \ -# "ndk;13.1.3345770" \ -# "ndk;14.0.3770861" \ -# "ndk;14.1.3816874" \ -# "ndk;15.0.4075724" \ -# "ndk;15.1.4119039" \ -# "ndk;15.2.4203891" \ -# "ndk;16.0.4442984" \ -# "ndk;16.1.4479499" \ -# "ndk;17.0.4754217" \ -# "ndk;17.1.4828580" \ -# "ndk;17.2.4988734" \ -# "ndk;18.1.5063045" \ -# "ndk;19.0.5232133" \ -# "ndk;19.1.5304403" \ -# "ndk;19.2.5345600" \ -# "ndk;20.0.5392854-beta2" \ -# "ndk;20.0.5471264-beta3" \ -# "ndk;20.0.5594570" \ -# "ndk;20.1.5948944" \ -# "ndk;21.0.6011959-beta2" \ -# "ndk;21.0.6113669" \ -# "ndk;21.1.6210238-beta1" \ -# "ndk;21.1.6273396-beta2" \ -# "ndk;21.1.6352462" \ -# "ndk;21.1.6363665-beta3" \ -# "ndk;21.2.6472646" \ -# "ndk;21.3.6528147" \ -# "ndk;21.4.7075529" \ -# "ndk;22.0.6917172-beta1" \ -# "ndk;22.0.7026061" \ -# "ndk;22.1.7171670" \ -# "ndk;23.0.7123448-beta1" \ -# "ndk;23.0.7196353-beta2" \ -# "ndk;23.0.7272597-beta3" \ -# "ndk;23.0.7344513-beta4" \ -# "ndk;23.0.7421159-beta5" \ -# "ndk;23.0.7530507-beta6" \ -# "ndk;23.0.7599858" \ -# "ndk;23.1.7779620" \ -# "ndk;23.2.8568313" \ -# "ndk;24.0.7856742-beta1" \ -# "ndk;24.0.7956693-beta2" \ -# "ndk;24.0.8079956-beta3" \ -# "ndk;24.0.8215888" \ -# "ndk;25.0.8141415-beta1" \ -# "ndk;25.0.8221429-beta2" \ -# "ndk;25.0.8355429-beta3" \ -# "ndk;25.0.8528842-beta4" \ -# "ndk;25.0.8775105" \ -# "ndk;25.1.8937393" \ - "ndk;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk;r10e" \ -# "ndk;r11" \ -# "ndk;r11b" \ -# "ndk;r11c" \ -# "ndk;r12" \ -# "ndk;r12b" \ -# "ndk;r13" \ -# "ndk;r13b" \ -# "ndk;r14" \ -# "ndk;r14b" \ -# "ndk;r15" \ -# "ndk;r15b" \ -# "ndk;r15c" \ -# "ndk;r16" \ -# "ndk;r16b" \ -# "ndk;r17" \ -# "ndk;r17b" \ -# "ndk;r17c" \ -# "ndk;r18b" \ -# "ndk;r19" \ -# "ndk;r19b" \ -# "ndk;r19c" \ -# "ndk;r20" \ -# "ndk;r20-beta2" \ -# "ndk;r20-beta3" \ -# "ndk;r20b" \ -# "ndk;r21" \ -# "ndk;r21-beta2" \ -# "ndk;r21b" \ -# "ndk;r21b-beta1" \ -# "ndk;r21b-beta2" \ -# "ndk;r21b-beta3" \ -# "ndk;r21c" \ -# "ndk;r21d" \ -# "ndk;r21e" \ -# "ndk;r22" \ -# "ndk;r22-beta1" \ -# "ndk;r22b" \ -# "ndk;r23" \ -# "ndk;r23-beta1" \ -# "ndk;r23-beta2" \ -# "ndk;r23-beta3" \ -# "ndk;r23-beta4" \ -# "ndk;r23-beta5" \ -# "ndk;r23-beta6" \ -# "ndk;r23b" \ -# "ndk;r23c" \ -# "ndk;r24" \ -# "ndk;r24-beta1" \ -# "ndk;r24-beta2" \ -# "ndk;r24-rc1" \ - "ndk;r25" \ -# "ndk;r25-beta1" \ -# "ndk;r25-beta2" \ -# "ndk;r25-beta3" \ -# "ndk;r25-beta4" \ -# "ndk;r25b" \ - "ndk;r25c" - -RUN sdkmanager --install \ - "tools" \ -# "tools;20.0.1" \ -# "tools;20.0.3" \ -# "tools;21.0.1" \ -# "tools;22.0.1" \ -# "tools;22.0.4" \ -# "tools;22.0.5" \ -# "tools;22.2.1" \ -# "tools;22.6.1" \ -# "tools;22.6.2" \ -# "tools;22.6.3" \ -# "tools;22.6.4" \ -# "tools;23.0.1" \ -# "tools;23.0.2" \ -# "tools;23.0.4" \ -# "tools;23.0.5" \ -# "tools;24.0.1" \ -# "tools;24.0.2" \ -# "tools;24.1.2" \ -# "tools;24.3.1" \ -# "tools;24.3.2" \ -# "tools;24.3.3" \ -# "tools;24.3.4" \ -# "tools;24.4.1" \ -# "tools;25.0.1" \ -# "tools;25.0.2" \ -# "tools;25.0.3" \ -# "tools;25.0.4" \ -# "tools;25.0.5" \ -# "tools;25.0.6" \ -# "tools;25.0.7" \ -# "tools;25.0.8" \ -# "tools;25.0.9" \ -# "tools;25.1.0" \ -# "tools;25.1.1" \ -# "tools;25.1.2" \ -# "tools;25.1.3" \ -# "tools;25.1.4" \ -# "tools;25.1.5" \ -# "tools;25.1.6" \ -# "tools;25.1.7" \ -# "tools;25.2.1" \ -# "tools;25.2.2" \ -# "tools;25.2.3" \ -# "tools;25.2.4" \ -# "tools;25.2.5" \ - "tools;25.2.5" -# "tools;26.1.1" - -# Activate android sdk -#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license -#RUN rm -rfv /usr/lib/android-sdk/licenses/* -RUN yes | sdkmanager --licenses -RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk11/docker-compose.yml b/linux/obsolete/teamcity/agent/android-sdk/jdk11/docker-compose.yml deleted file mode 100644 index 94bd083d7..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk11/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - app: - image: "hub.epicm.org/epicmorg/teamcity-agent:android-sdk-jdk11" - build: - context: . diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk11/sdkman.sh b/linux/obsolete/teamcity/agent/android-sdk/jdk11/sdkman.sh deleted file mode 100755 index 59b74df1e..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk11/sdkman.sh +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Marco Vermeulen -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# install:- channel: stable; cliVersion: 5.15.0; cliNativeVersion: NA; api: https://api.sdkman.io/2 - -# Global variables -SDKMAN_SERVICE="https://api.sdkman.io/2" -SDKMAN_VERSION="5.15.0" -SDKMAN_PLATFORM=$(uname) - -if [ -z "$SDKMAN_DIR" ]; then - SDKMAN_DIR="$HOME/.sdkman" - SDKMAN_DIR_RAW='$HOME/.sdkman' -else - SDKMAN_DIR_RAW="$SDKMAN_DIR" -fi - -# Local variables -sdkman_tmp_folder="${SDKMAN_DIR}/tmp" -sdkman_zip_file="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}.zip" -sdkman_zip_base_folder="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}" -sdkman_ext_folder="${SDKMAN_DIR}/ext" -sdkman_etc_folder="${SDKMAN_DIR}/etc" -sdkman_var_folder="${SDKMAN_DIR}/var" -sdkman_archives_folder="${SDKMAN_DIR}/archives" -sdkman_candidates_folder="${SDKMAN_DIR}/candidates" -sdkman_config_file="${sdkman_etc_folder}/config" -sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" -sdkman_bashrc="${HOME}/.bashrc" -sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc" - -sdkman_init_snippet=$( cat << EOF -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$SDKMAN_DIR_RAW" -[[ -s "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" -EOF -) - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -solaris=false; -freebsd=false; -case "$(uname)" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - SunOS*) - solaris=true - ;; - FreeBSD*) - freebsd=true -esac - -echo '' -echo ' -+syyyyyyys:' -echo ' `/yho:` -yd.' -echo ' `/yh/` +m.' -echo ' .oho. hy .`' -echo ' .sh/` :N` `-/o` `+dyyo:.' -echo ' .yh:` `M- `-/osysoym :hs` `-+sys: hhyssssssssy+' -echo ' .sh:` `N: ms/-`` yy.yh- -hy. `.N-````````+N.' -echo ' `od/` `N- -/oM- ddd+` `sd: hNNm -N:' -echo ' :do` .M. dMMM- `ms. /d+` `NMMs `do' -echo ' .yy- :N` ```mMMM. - -hy. /MMM: yh' -echo ' `+d+` `:/oo/` `-/osyh/ossssssdNMM` .sh: yMMN` /m.' -echo ' -dh- :ymNMMMMy `-/shmNm-`:N/-.`` `.sN /N- `NMMy .m/' -echo ' `oNs` -hysosmMMMMydmNmds+-.:ohm : sd` :MMM/ yy' -echo ' .hN+ /d: -MMMmhs/-.` .MMMh .ss+- `yy` sMMN` :N.' -echo ' :mN/ `N/ `o/-` :MMMo +MMMN- .` `ds mMMh do' -echo ' /NN/ `N+....--:/+oooosooo+:sMMM: hMMMM: `my .m+ -MMM+ :N.' -echo ' /NMo -+ooooo+/:-....`...:+hNMN. `NMMMd` .MM/ -m: oMMN. hs' -echo ' -NMd` :mm -MMMm- .s/ -MMm. /m- mMMd -N.' -echo ' `mMM/ .- /MMh. -dMo -MMMy od. .MMMs..---yh' -echo ' +MMM. sNo`.sNMM+ :MMMM/ sh`+MMMNmNm+++-' -echo ' mMMM- /--ohmMMM+ :MMMMm. `hyymmmdddo' -echo ' MMMMh. ```` `-+yy/`yMMM/ :MMMMMy -sm:.``..-:-.`' -echo ' dMMMMmo-.``````..-:/osyhddddho. `+shdh+. hMMM: :MmMMMM/ ./yy/` `:sys+/+sh/' -echo ' .dMMMMMMmdddddmmNMMMNNNNNMMMMMs sNdo- dMMM- `-/yd/MMMMm-:sy+. :hs- /N`' -echo ' `/ymNNNNNNNmmdys+/::----/dMMm: +m- mMMM+ohmo/.` sMMMMdo- .om: `sh' -echo ' `.-----+/.` `.-+hh/` `od. NMMNmds/ `mmy:` +mMy `:yy.' -echo ' /moyso+//+ossso:. .yy` `dy+:` .. :MMMN+---/oys:' -echo ' /+m: `.-:::-` /d+ +MMMMMMMNh:`' -echo ' +MN/ -yh. `+hddhy+.' -echo ' /MM+ .sh:' -echo ' :NMo -sh/' -echo ' -NMs `/yy:' -echo ' .NMy `:sh+.' -echo ' `mMm` ./yds-' -echo ' `dMMMmyo:-.````.-:oymNy:`' -echo ' +NMMMMMMMMMMMMMMMMms:`' -echo ' -+shmNMMMNmdy+:`' -echo '' -echo '' -echo ' Now attempting installation...' -echo '' -echo '' - -# Sanity checks - -echo "Looking for a previous installation of SDKMAN..." -if [ -d "$SDKMAN_DIR" ]; then - echo "SDKMAN found." - echo "" - echo "======================================================================================================" - echo " You already have SDKMAN installed." - echo " SDKMAN was found at:" - echo "" - echo " ${SDKMAN_DIR}" - echo "" - echo " Please consider running the following if you need to upgrade." - echo "" - echo " $ sdk selfupdate force" - echo "" - echo "======================================================================================================" - echo "" - exit 0 -fi - -echo "Looking for unzip..." -if ! command -v unzip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install unzip on your system using your favourite package manager." - echo "" - echo " Restart after installing unzip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for zip..." -if ! command -v zip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install zip on your system using your favourite package manager." - echo "" - echo " Restart after installing zip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for curl..." -if ! command -v curl > /dev/null; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install curl on your system using your favourite package manager." - echo "" - echo " Restart after installing curl." - echo "======================================================================================================" - echo "" - exit 1 -fi - -if [[ "$solaris" == true ]]; then - echo "Looking for gsed..." - if [ -z $(which gsed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install gsed on your solaris system." - echo "" - echo " SDKMAN uses gsed extensively." - echo "" - echo " Restart after installing gsed." - echo "======================================================================================================" - echo "" - exit 1 - fi -else - echo "Looking for sed..." - if [ -z $(command -v sed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install sed on your system using your favourite package manager." - echo "" - echo " Restart after installing sed." - echo "======================================================================================================" - echo "" - exit 1 - fi -fi - -echo "Installing SDKMAN scripts..." - - -# Create directory structure - -echo "Create distribution directories..." -mkdir -p "$sdkman_tmp_folder" -mkdir -p "$sdkman_ext_folder" -mkdir -p "$sdkman_etc_folder" -mkdir -p "$sdkman_var_folder" -mkdir -p "$sdkman_archives_folder" -mkdir -p "$sdkman_candidates_folder" - -echo "Getting available candidates..." -SDKMAN_CANDIDATES_CSV=$(curl -s "${SDKMAN_SERVICE}/candidates/all") -echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" - -echo "Prime the config file..." -touch "$sdkman_config_file" -echo "sdkman_auto_answer=false" >> "$sdkman_config_file" -if [ -z "$ZSH_VERSION" -a -z "$BASH_VERSION" ]; then - echo "sdkman_auto_complete=false" >> "$sdkman_config_file" -else - echo "sdkman_auto_complete=true" >> "$sdkman_config_file" -fi -echo "sdkman_auto_env=false" >> "$sdkman_config_file" -echo "sdkman_auto_update=true" >> "$sdkman_config_file" -echo "sdkman_beta_channel=false" >> "$sdkman_config_file" -echo "sdkman_checksum_enable=true" >> "$sdkman_config_file" -echo "sdkman_colour_enable=true" >> "$sdkman_config_file" -echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file" -echo "sdkman_curl_max_time=10" >> "$sdkman_config_file" -echo "sdkman_debug_mode=false" >> "$sdkman_config_file" -echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file" -echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file" -echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file" - -echo "Download script archive..." -curl --location --progress-bar "${SDKMAN_SERVICE}/broker/download/sdkman/install/${SDKMAN_VERSION}/${SDKMAN_PLATFORM}" > "$sdkman_zip_file" - -ARCHIVE_OK=$(unzip -qt "$sdkman_zip_file" | grep 'No errors detected in compressed data') -if [[ -z "$ARCHIVE_OK" ]]; then - echo "Downloaded zip archive corrupt. Are you connected to the internet?" - echo "" - echo "If problems persist, please ask for help on our Slack:" - echo "* easy sign up: https://slack.sdkman.io/" - echo "* report on channel: https://sdkman.slack.com/app_redirect?channel=user-issues" - rm -rf "$SDKMAN_DIR" - exit 1 -fi - -echo "Extract script archive..." -if [[ "$cygwin" == 'true' ]]; then - echo "Cygwin detected - normalizing paths for unzip..." - sdkman_tmp_folder=$(cygpath -w "$sdkman_tmp_folder") - sdkman_zip_file=$(cygpath -w "$sdkman_zip_file") - sdkman_zip_base_folder=$(cygpath -w "$sdkman_zip_base_folder") -fi -unzip -qo "$sdkman_zip_file" -d "$sdkman_tmp_folder" - -echo "Install scripts..." -mv "${sdkman_zip_base_folder}/"* "$SDKMAN_DIR" -rm -rf "$sdkman_zip_base_folder" - -echo "Set version to $SDKMAN_VERSION ..." -echo "$SDKMAN_VERSION" > "${SDKMAN_DIR}/var/version" - - -if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" - echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" - echo "Added sdkman init snippet to $sdkman_bash_profile" - fi -else - echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" - echo "Added sdkman init snippet to $sdkman_bashrc" - fi -fi - -echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" - echo "Updated existing ${sdkman_zshrc}" -fi - - - -echo -e "\n\n\nAll done!\n\n" - -echo "You are subscribed to the STABLE channel." - -echo "" -echo "Please open a new terminal, or run the following in the existing one:" -echo "" -echo " source \"${SDKMAN_DIR}/bin/sdkman-init.sh\"" -echo "" -echo "Then issue the following command:" -echo "" -echo " sdk help" -echo "" -echo "Enjoy!!!" diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk17/Dockerfile b/linux/obsolete/teamcity/agent/android-sdk/jdk17/Dockerfile deleted file mode 100644 index 119c45782..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk17/Dockerfile +++ /dev/null @@ -1,560 +0,0 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest-jdk17 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk - -ENV PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin - -################################################################## -# Android SDK -################################################################## -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - android-sdk \ - sdkmanager \ - android-sdk-build-tools \ - android-sdk-platform-tools-common \ - android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ - apt remove -y gradle && \ - sdkmanager --version && \ - mvn -v - -# Install ALL ANDROID SDK -RUN sdkmanager --install \ -# "build-tools;17.0.0" \ -# "build-tools;18.0.0" \ -# "build-tools;18.0.1" \ -# "build-tools;18.1.0" \ -# "build-tools;18.1.1" \ -# "build-tools;19.0.0" \ -# "build-tools;19.0.1" \ -# "build-tools;19.0.2" \ -# "build-tools;19.0.3" \ -# "build-tools;19.1.0" \ -# "build-tools;20.0.0" \ -# "build-tools;21.0.0" \ -# "build-tools;21.0.1" \ -# "build-tools;21.0.2" \ -# "build-tools;21.1.0" \ -# "build-tools;21.1.1" \ -# "build-tools;21.1.2" \ -# "build-tools;22.0.0" \ -# "build-tools;22.0.1" \ -# "build-tools;23.0.0" \ -# "build-tools;23.0.1" \ -# "build-tools;23.0.2" \ -# "build-tools;23.0.3" \ -# "build-tools;24.0.0" \ -# "build-tools;24.0.1" \ -# "build-tools;24.0.2" \ -# "build-tools;24.0.3" \ -# "build-tools;25.0.0" \ -# "build-tools;25.0.1" \ -# "build-tools;25.0.2" \ -# "build-tools;25.0.3" \ -# "build-tools;26.0.0" \ -# "build-tools;26.0.0-rc1" \ -# "build-tools;26.0.0-rc2" \ -# "build-tools;26.0.1" \ -# "build-tools;26.0.2" \ -# "build-tools;26.0.3" \ -# "build-tools;27.0.0" \ -# "build-tools;27.0.1" \ -# "build-tools;27.0.2" \ -# "build-tools;27.0.3" \ -# "build-tools;28.0.0" \ -# "build-tools;28.0.0-rc1" \ -# "build-tools;28.0.0-rc2" \ -# "build-tools;28.0.1" \ -# "build-tools;28.0.2" \ -# "build-tools;28.0.3" \ -# "build-tools;29.0.0" \ -# "build-tools;29.0.0-rc1" \ -# "build-tools;29.0.0-rc2" \ -# "build-tools;29.0.0-rc3" \ -# "build-tools;29.0.1" \ -# "build-tools;29.0.2" \ -# "build-tools;29.0.3" \ -# "build-tools;30.0.0" \ -# "build-tools;30.0.0-rc1" \ -# "build-tools;30.0.0-rc2" \ -# "build-tools;30.0.0-rc3" \ -# "build-tools;30.0.0-rc4" \ -# "build-tools;30.0.1" \ -# "build-tools;30.0.2" \ -# "build-tools;30.0.3" \ -# "build-tools;31.0.0" \ -# "build-tools;31.0.0-rc1" \ -# "build-tools;31.0.0-rc2" \ -# "build-tools;31.0.0-rc3" \ -# "build-tools;31.0.0-rc4" \ -# "build-tools;31.0.0-rc5" \ -# "build-tools;32.0.0" \ -# "build-tools;32.1.0-rc1" \ -# "build-tools;33.0.0" \ -# "build-tools;33.0.0-rc1" \ -# "build-tools;33.0.0-rc2" \ -# "build-tools;33.0.0-rc3" \ -# "build-tools;33.0.0-rc4" \ -# "build-tools;33.0.1" \ -# "build-tools;33.0.2" \ -# "build-tools;34.0.0" \ -# "build-tools;34.0.0-rc1" \ -# "build-tools;34.0.0-rc2" \ -# "build-tools;34.0.0-rc3" \ - "build-tools;34.0.0-rc4" - -RUN sdkmanager --install \ - "cmake;3.10.2.4988404" \ - "cmake;3.18.1" \ - "cmake;3.22.1" \ - "cmake;3.6.4111459" - -RUN sdkmanager --install \ -# "cmdline-tools;1.0" \ -# "cmdline-tools;1.0-alpha01" \ -# "cmdline-tools;10.0-beta04" \ -# "cmdline-tools;11.0-alpha07" \ -# "cmdline-tools;2.0" \ -# "cmdline-tools;2.0-rc01" \ -# "cmdline-tools;2.1" \ -# "cmdline-tools;3.0" \ -# "cmdline-tools;3.0-beta01" \ -# "cmdline-tools;4.0" \ -# "cmdline-tools;4.0-alpha02" \ -# "cmdline-tools;4.0-beta01" \ -# "cmdline-tools;5.0" \ -# "cmdline-tools;5.0-alpha01" \ -# "cmdline-tools;6.0" \ -# "cmdline-tools;7.0" \ -# "cmdline-tools;8.0" \ -# "cmdline-tools;9.0" \ - "cmdline-tools;latest" - -RUN sdkmanager --install \ - "extras;android;m2repository" \ -# "extras;android;m2repository;01" \ -# "extras;android;m2repository;02" \ -# "extras;android;m2repository;03" \ -# "extras;android;m2repository;04" \ -# "extras;android;m2repository;06" \ -# "extras;android;m2repository;07" \ -# "extras;android;m2repository;08" \ -# "extras;android;m2repository;09" \ -# "extras;android;m2repository;1" \ -# "extras;android;m2repository;2" \ -# "extras;android;m2repository;3" \ -# "extras;android;m2repository;4" \ -# "extras;android;m2repository;6" \ -# "extras;android;m2repository;7" \ -# "extras;android;m2repository;8" \ -# "extras;android;m2repository;9" \ -# "extras;android;m2repository;10" \ -# "extras;android;m2repository;11" \ -# "extras;android;m2repository;12" \ -# "extras;android;m2repository;13" \ -# "extras;android;m2repository;14" \ -# "extras;android;m2repository;15" \ -# "extras;android;m2repository;16" \ -# "extras;android;m2repository;17" \ -# "extras;android;m2repository;18" \ -# "extras;android;m2repository;19" \ -# "extras;android;m2repository;20" \ -# "extras;android;m2repository;21" \ -# "extras;android;m2repository;22" \ -# "extras;android;m2repository;23" \ -# "extras;android;m2repository;24" \ -# "extras;android;m2repository;25" \ -# "extras;android;m2repository;26" \ -# "extras;android;m2repository;27" \ -# "extras;android;m2repository;28" \ -# "extras;android;m2repository;29" \ -# "extras;android;m2repository;30" \ -# "extras;android;m2repository;31" \ -# "extras;android;m2repository;32" \ -# "extras;android;m2repository;33" \ -# "extras;android;m2repository;34" \ -# "extras;android;m2repository;35" \ -# "extras;android;m2repository;36" \ -# "extras;android;m2repository;37" \ -# "extras;android;m2repository;38" \ -# "extras;android;m2repository;39" \ -# "extras;android;m2repository;40" \ -# "extras;android;m2repository;41" \ -# "extras;android;m2repository;42" \ -# "extras;android;m2repository;43" \ -# "extras;android;m2repository;44" \ -# "extras;android;m2repository;45" \ -# "extras;android;m2repository;46" \ - "extras;android;m2repository;47" - -RUN sdkmanager --install \ - "platform-tools" \ -# "platform-tools;24.0.0" \ -# "platform-tools;29.0.5" \ -# "platform-tools;29.0.6" \ -# "platform-tools;30.0.0" \ -# "platform-tools;30.0.1" \ -# "platform-tools;30.0.2" \ -# "platform-tools;30.0.3" \ -# "platform-tools;30.0.4" \ -# "platform-tools;30.0.5" \ -# "platform-tools;31.0.0" \ -# "platform-tools;31.0.1" \ -# "platform-tools;31.0.2" \ -# "platform-tools;31.0.3" \ -# "platform-tools;32.0.0" \ -# "platform-tools;33.0.0" \ -# "platform-tools;33.0.1" \ -# "platform-tools;33.0.2" \ -# "platform-tools;33.0.3" \ -# "platform-tools;34.0.0" \ -# "platform-tools;34.0.1" \ - "platform-tools;34.0.3" - -RUN sdkmanager --install \ -# "platforms;android-1" \ -# "platforms;android-2" \ -# "platforms;android-3" \ -# "platforms;android-4" \ -# "platforms;android-5" \ -# "platforms;android-6" \ -# "platforms;android-7" \ -# "platforms;android-8" \ -# "platforms;android-9" \ -# "platforms;android-10" \ -# "platforms;android-11" \ -# "platforms;android-12" \ -# "platforms;android-13" \ -# "platforms;android-14" \ -# "platforms;android-15" \ -# "platforms;android-16" \ -# "platforms;android-17" \ -# "platforms;android-18" \ -# "platforms;android-19" \ -# "platforms;android-20" \ -# "platforms;android-21" \ -# "platforms;android-22" \ -# "platforms;android-23" \ -# "platforms;android-24" \ -# "platforms;android-25" \ -# "platforms;android-26" \ -# "platforms;android-27" \ -# "platforms;android-28" \ -# "platforms;android-29" \ -# "platforms;android-30" \ -# "platforms;android-31" \ -# "platforms;android-32" \ -# "platforms;android-33" \ -# "platforms;android-34" \ - "platforms;android-35" - -RUN sdkmanager --install \ -# "ndk-bundle;11.0.2655954" \ -# "ndk-bundle;11.1.2683735" \ -# "ndk-bundle;11.2.2725575" \ -# "ndk-bundle;12.0.2931149" \ -# "ndk-bundle;12.1.2977051" \ -# "ndk-bundle;13.0.3315539" \ -# "ndk-bundle;13.1.3345770" \ -# "ndk-bundle;14.0.3770861" \ -# "ndk-bundle;14.1.3816874" \ -# "ndk-bundle;15.0.4075724" \ -# "ndk-bundle;15.1.4119039" \ -# "ndk-bundle;15.2.4203891" \ -# "ndk-bundle;16.0.4442984" \ -# "ndk-bundle;16.1.4479499" \ -# "ndk-bundle;17.0.4754217" \ -# "ndk-bundle;17.1.4828580" \ -# "ndk-bundle;17.2.4988734" \ -# "ndk-bundle;18.1.5063045" \ -# "ndk-bundle;19.0.5232133" \ -# "ndk-bundle;19.1.5304403" \ -# "ndk-bundle;19.2.5345600" \ -# "ndk-bundle;20.0.5392854-beta2" \ -# "ndk-bundle;20.0.5471264-beta3" \ -# "ndk-bundle;20.0.5594570" \ -# "ndk-bundle;20.1.5948944" \ -# "ndk-bundle;21.0.6011959-beta2" \ -# "ndk-bundle;21.0.6113669" \ -# "ndk-bundle;21.1.6210238-beta1" \ -# "ndk-bundle;21.1.6273396-beta2" \ -# "ndk-bundle;21.1.6352462" \ -# "ndk-bundle;21.1.6363665-beta3" \ -# "ndk-bundle;21.2.6472646" \ -# "ndk-bundle;21.3.6528147" \ -# "ndk-bundle;21.4.7075529" \ -# "ndk-bundle;22.0.6917172-beta1" \ -# "ndk-bundle;22.0.7026061" \ -# "ndk-bundle;22.1.7171670" \ -# "ndk-bundle;23.0.7123448-beta1" \ -# "ndk-bundle;23.0.7196353-beta2" \ -# "ndk-bundle;23.0.7272597-beta3" \ -# "ndk-bundle;23.0.7344513-beta4" \ -# "ndk-bundle;23.0.7421159-beta5" \ -# "ndk-bundle;23.0.7530507-beta6" \ -# "ndk-bundle;23.0.7599858" \ -# "ndk-bundle;23.1.7779620" \ -# "ndk-bundle;23.2.8568313" \ -# "ndk-bundle;24.0.7856742-beta1" \ -# "ndk-bundle;24.0.7956693-beta2" \ -# "ndk-bundle;24.0.8079956-beta3" \ -# "ndk-bundle;24.0.8215888" \ -# "ndk-bundle;25.0.8141415-beta1" \ -# "ndk-bundle;25.0.8221429-beta2" \ -# "ndk-bundle;25.0.8355429-beta3" \ -# "ndk-bundle;25.0.8528842-beta4" \ -# "ndk-bundle;25.0.8775105" \ -# "ndk-bundle;25.1.8937393" \ - "ndk-bundle;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk-bundle;r10e" \ -# "ndk-bundle;r11" \ -# "ndk-bundle;r11b" \ -# "ndk-bundle;r11c" \ -# "ndk-bundle;r12" \ -# "ndk-bundle;r12b" \ -# "ndk-bundle;r13" \ -# "ndk-bundle;r13b" \ -# "ndk-bundle;r14" \ -# "ndk-bundle;r14b" \ -# "ndk-bundle;r15" \ -# "ndk-bundle;r15b" \ -# "ndk-bundle;r15c" \ -# "ndk-bundle;r16" \ -# "ndk-bundle;r16b" \ -# "ndk-bundle;r17" \ -# "ndk-bundle;r17b" \ -# "ndk-bundle;r17c" \ -# "ndk-bundle;r18b" \ -# "ndk-bundle;r19" \ -# "ndk-bundle;r19b" \ -# "ndk-bundle;r19c" \ -# "ndk-bundle;r20" \ -# "ndk-bundle;r20-beta2" \ -# "ndk-bundle;r20-beta3" \ -# "ndk-bundle;r20b" \ -# "ndk-bundle;r21" \ -# "ndk-bundle;r21-beta2" \ -# "ndk-bundle;r21b" \ -# "ndk-bundle;r21b-beta1" \ -# "ndk-bundle;r21b-beta2" \ -# "ndk-bundle;r21b-beta3" \ -# "ndk-bundle;r21c" \ -# "ndk-bundle;r21d" \ -# "ndk-bundle;r21e" \ -# "ndk-bundle;r22" \ -# "ndk-bundle;r22-beta1" \ -# "ndk-bundle;r22b" \ -# "ndk-bundle;r23" \ -# "ndk-bundle;r23-beta1" \ -# "ndk-bundle;r23-beta2" \ -# "ndk-bundle;r23-beta3" \ -# "ndk-bundle;r23-beta4" \ -# "ndk-bundle;r23-beta5" \ -# "ndk-bundle;r23-beta6" \ -# "ndk-bundle;r23b" \ -# "ndk-bundle;r23c" \ -# "ndk-bundle;r24" \ -# "ndk-bundle;r24-beta1" \ -# "ndk-bundle;r24-beta2" \ -# "ndk-bundle;r24-rc1" \ - "ndk-bundle;r25" \ -# "ndk-bundle;r25-beta1" \ -# "ndk-bundle;r25-beta2" \ -# "ndk-bundle;r25-beta3" \ -# "ndk-bundle;r25-beta4" \ -# "ndk-bundle;r25b" \ - "ndk-bundle;r25c" - -RUN sdkmanager --install \ -# "ndk;11.0.2655954" \ -# "ndk;11.1.2683735" \ -# "ndk;11.2.2725575" \ -# "ndk;12.0.2931149" \ -# "ndk;12.1.2977051" \ -# "ndk;13.0.3315539" \ -# "ndk;13.1.3345770" \ -# "ndk;14.0.3770861" \ -# "ndk;14.1.3816874" \ -# "ndk;15.0.4075724" \ -# "ndk;15.1.4119039" \ -# "ndk;15.2.4203891" \ -# "ndk;16.0.4442984" \ -# "ndk;16.1.4479499" \ -# "ndk;17.0.4754217" \ -# "ndk;17.1.4828580" \ -# "ndk;17.2.4988734" \ -# "ndk;18.1.5063045" \ -# "ndk;19.0.5232133" \ -# "ndk;19.1.5304403" \ -# "ndk;19.2.5345600" \ -# "ndk;20.0.5392854-beta2" \ -# "ndk;20.0.5471264-beta3" \ -# "ndk;20.0.5594570" \ -# "ndk;20.1.5948944" \ -# "ndk;21.0.6011959-beta2" \ -# "ndk;21.0.6113669" \ -# "ndk;21.1.6210238-beta1" \ -# "ndk;21.1.6273396-beta2" \ -# "ndk;21.1.6352462" \ -# "ndk;21.1.6363665-beta3" \ -# "ndk;21.2.6472646" \ -# "ndk;21.3.6528147" \ -# "ndk;21.4.7075529" \ -# "ndk;22.0.6917172-beta1" \ -# "ndk;22.0.7026061" \ -# "ndk;22.1.7171670" \ -# "ndk;23.0.7123448-beta1" \ -# "ndk;23.0.7196353-beta2" \ -# "ndk;23.0.7272597-beta3" \ -# "ndk;23.0.7344513-beta4" \ -# "ndk;23.0.7421159-beta5" \ -# "ndk;23.0.7530507-beta6" \ -# "ndk;23.0.7599858" \ -# "ndk;23.1.7779620" \ -# "ndk;23.2.8568313" \ -# "ndk;24.0.7856742-beta1" \ -# "ndk;24.0.7956693-beta2" \ -# "ndk;24.0.8079956-beta3" \ -# "ndk;24.0.8215888" \ -# "ndk;25.0.8141415-beta1" \ -# "ndk;25.0.8221429-beta2" \ -# "ndk;25.0.8355429-beta3" \ -# "ndk;25.0.8528842-beta4" \ -# "ndk;25.0.8775105" \ -# "ndk;25.1.8937393" \ - "ndk;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk;r10e" \ -# "ndk;r11" \ -# "ndk;r11b" \ -# "ndk;r11c" \ -# "ndk;r12" \ -# "ndk;r12b" \ -# "ndk;r13" \ -# "ndk;r13b" \ -# "ndk;r14" \ -# "ndk;r14b" \ -# "ndk;r15" \ -# "ndk;r15b" \ -# "ndk;r15c" \ -# "ndk;r16" \ -# "ndk;r16b" \ -# "ndk;r17" \ -# "ndk;r17b" \ -# "ndk;r17c" \ -# "ndk;r18b" \ -# "ndk;r19" \ -# "ndk;r19b" \ -# "ndk;r19c" \ -# "ndk;r20" \ -# "ndk;r20-beta2" \ -# "ndk;r20-beta3" \ -# "ndk;r20b" \ -# "ndk;r21" \ -# "ndk;r21-beta2" \ -# "ndk;r21b" \ -# "ndk;r21b-beta1" \ -# "ndk;r21b-beta2" \ -# "ndk;r21b-beta3" \ -# "ndk;r21c" \ -# "ndk;r21d" \ -# "ndk;r21e" \ -# "ndk;r22" \ -# "ndk;r22-beta1" \ -# "ndk;r22b" \ -# "ndk;r23" \ -# "ndk;r23-beta1" \ -# "ndk;r23-beta2" \ -# "ndk;r23-beta3" \ -# "ndk;r23-beta4" \ -# "ndk;r23-beta5" \ -# "ndk;r23-beta6" \ -# "ndk;r23b" \ -# "ndk;r23c" \ -# "ndk;r24" \ -# "ndk;r24-beta1" \ -# "ndk;r24-beta2" \ -# "ndk;r24-rc1" \ - "ndk;r25" \ -# "ndk;r25-beta1" \ -# "ndk;r25-beta2" \ -# "ndk;r25-beta3" \ -# "ndk;r25-beta4" \ -# "ndk;r25b" \ - "ndk;r25c" - -RUN sdkmanager --install \ - "tools" \ -# "tools;20.0.1" \ -# "tools;20.0.3" \ -# "tools;21.0.1" \ -# "tools;22.0.1" \ -# "tools;22.0.4" \ -# "tools;22.0.5" \ -# "tools;22.2.1" \ -# "tools;22.6.1" \ -# "tools;22.6.2" \ -# "tools;22.6.3" \ -# "tools;22.6.4" \ -# "tools;23.0.1" \ -# "tools;23.0.2" \ -# "tools;23.0.4" \ -# "tools;23.0.5" \ -# "tools;24.0.1" \ -# "tools;24.0.2" \ -# "tools;24.1.2" \ -# "tools;24.3.1" \ -# "tools;24.3.2" \ -# "tools;24.3.3" \ -# "tools;24.3.4" \ -# "tools;24.4.1" \ -# "tools;25.0.1" \ -# "tools;25.0.2" \ -# "tools;25.0.3" \ -# "tools;25.0.4" \ -# "tools;25.0.5" \ -# "tools;25.0.6" \ -# "tools;25.0.7" \ -# "tools;25.0.8" \ -# "tools;25.0.9" \ -# "tools;25.1.0" \ -# "tools;25.1.1" \ -# "tools;25.1.2" \ -# "tools;25.1.3" \ -# "tools;25.1.4" \ -# "tools;25.1.5" \ -# "tools;25.1.6" \ -# "tools;25.1.7" \ -# "tools;25.2.1" \ -# "tools;25.2.2" \ -# "tools;25.2.3" \ -# "tools;25.2.4" \ -# "tools;25.2.5" \ - "tools;25.2.5" -# "tools;26.1.1" - -# Activate android sdk -#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license -#RUN rm -rfv /usr/lib/android-sdk/licenses/* -RUN yes | sdkmanager --licenses -RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk17/docker-compose.yml b/linux/obsolete/teamcity/agent/android-sdk/jdk17/docker-compose.yml deleted file mode 100644 index c1721f76f..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk17/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -services: - app: - image: "hub.epicm.org/epicmorg/teamcity-agent:android-sdk" - build: - context: . - app-jdk17: - image: "hub.epicm.org/epicmorg/teamcity-agent:android-sdk-jdk17" - build: - context: . diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk17/sdkman.sh b/linux/obsolete/teamcity/agent/android-sdk/jdk17/sdkman.sh deleted file mode 100755 index 59b74df1e..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk17/sdkman.sh +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Marco Vermeulen -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# install:- channel: stable; cliVersion: 5.15.0; cliNativeVersion: NA; api: https://api.sdkman.io/2 - -# Global variables -SDKMAN_SERVICE="https://api.sdkman.io/2" -SDKMAN_VERSION="5.15.0" -SDKMAN_PLATFORM=$(uname) - -if [ -z "$SDKMAN_DIR" ]; then - SDKMAN_DIR="$HOME/.sdkman" - SDKMAN_DIR_RAW='$HOME/.sdkman' -else - SDKMAN_DIR_RAW="$SDKMAN_DIR" -fi - -# Local variables -sdkman_tmp_folder="${SDKMAN_DIR}/tmp" -sdkman_zip_file="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}.zip" -sdkman_zip_base_folder="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}" -sdkman_ext_folder="${SDKMAN_DIR}/ext" -sdkman_etc_folder="${SDKMAN_DIR}/etc" -sdkman_var_folder="${SDKMAN_DIR}/var" -sdkman_archives_folder="${SDKMAN_DIR}/archives" -sdkman_candidates_folder="${SDKMAN_DIR}/candidates" -sdkman_config_file="${sdkman_etc_folder}/config" -sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" -sdkman_bashrc="${HOME}/.bashrc" -sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc" - -sdkman_init_snippet=$( cat << EOF -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$SDKMAN_DIR_RAW" -[[ -s "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" -EOF -) - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -solaris=false; -freebsd=false; -case "$(uname)" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - SunOS*) - solaris=true - ;; - FreeBSD*) - freebsd=true -esac - -echo '' -echo ' -+syyyyyyys:' -echo ' `/yho:` -yd.' -echo ' `/yh/` +m.' -echo ' .oho. hy .`' -echo ' .sh/` :N` `-/o` `+dyyo:.' -echo ' .yh:` `M- `-/osysoym :hs` `-+sys: hhyssssssssy+' -echo ' .sh:` `N: ms/-`` yy.yh- -hy. `.N-````````+N.' -echo ' `od/` `N- -/oM- ddd+` `sd: hNNm -N:' -echo ' :do` .M. dMMM- `ms. /d+` `NMMs `do' -echo ' .yy- :N` ```mMMM. - -hy. /MMM: yh' -echo ' `+d+` `:/oo/` `-/osyh/ossssssdNMM` .sh: yMMN` /m.' -echo ' -dh- :ymNMMMMy `-/shmNm-`:N/-.`` `.sN /N- `NMMy .m/' -echo ' `oNs` -hysosmMMMMydmNmds+-.:ohm : sd` :MMM/ yy' -echo ' .hN+ /d: -MMMmhs/-.` .MMMh .ss+- `yy` sMMN` :N.' -echo ' :mN/ `N/ `o/-` :MMMo +MMMN- .` `ds mMMh do' -echo ' /NN/ `N+....--:/+oooosooo+:sMMM: hMMMM: `my .m+ -MMM+ :N.' -echo ' /NMo -+ooooo+/:-....`...:+hNMN. `NMMMd` .MM/ -m: oMMN. hs' -echo ' -NMd` :mm -MMMm- .s/ -MMm. /m- mMMd -N.' -echo ' `mMM/ .- /MMh. -dMo -MMMy od. .MMMs..---yh' -echo ' +MMM. sNo`.sNMM+ :MMMM/ sh`+MMMNmNm+++-' -echo ' mMMM- /--ohmMMM+ :MMMMm. `hyymmmdddo' -echo ' MMMMh. ```` `-+yy/`yMMM/ :MMMMMy -sm:.``..-:-.`' -echo ' dMMMMmo-.``````..-:/osyhddddho. `+shdh+. hMMM: :MmMMMM/ ./yy/` `:sys+/+sh/' -echo ' .dMMMMMMmdddddmmNMMMNNNNNMMMMMs sNdo- dMMM- `-/yd/MMMMm-:sy+. :hs- /N`' -echo ' `/ymNNNNNNNmmdys+/::----/dMMm: +m- mMMM+ohmo/.` sMMMMdo- .om: `sh' -echo ' `.-----+/.` `.-+hh/` `od. NMMNmds/ `mmy:` +mMy `:yy.' -echo ' /moyso+//+ossso:. .yy` `dy+:` .. :MMMN+---/oys:' -echo ' /+m: `.-:::-` /d+ +MMMMMMMNh:`' -echo ' +MN/ -yh. `+hddhy+.' -echo ' /MM+ .sh:' -echo ' :NMo -sh/' -echo ' -NMs `/yy:' -echo ' .NMy `:sh+.' -echo ' `mMm` ./yds-' -echo ' `dMMMmyo:-.````.-:oymNy:`' -echo ' +NMMMMMMMMMMMMMMMMms:`' -echo ' -+shmNMMMNmdy+:`' -echo '' -echo '' -echo ' Now attempting installation...' -echo '' -echo '' - -# Sanity checks - -echo "Looking for a previous installation of SDKMAN..." -if [ -d "$SDKMAN_DIR" ]; then - echo "SDKMAN found." - echo "" - echo "======================================================================================================" - echo " You already have SDKMAN installed." - echo " SDKMAN was found at:" - echo "" - echo " ${SDKMAN_DIR}" - echo "" - echo " Please consider running the following if you need to upgrade." - echo "" - echo " $ sdk selfupdate force" - echo "" - echo "======================================================================================================" - echo "" - exit 0 -fi - -echo "Looking for unzip..." -if ! command -v unzip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install unzip on your system using your favourite package manager." - echo "" - echo " Restart after installing unzip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for zip..." -if ! command -v zip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install zip on your system using your favourite package manager." - echo "" - echo " Restart after installing zip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for curl..." -if ! command -v curl > /dev/null; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install curl on your system using your favourite package manager." - echo "" - echo " Restart after installing curl." - echo "======================================================================================================" - echo "" - exit 1 -fi - -if [[ "$solaris" == true ]]; then - echo "Looking for gsed..." - if [ -z $(which gsed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install gsed on your solaris system." - echo "" - echo " SDKMAN uses gsed extensively." - echo "" - echo " Restart after installing gsed." - echo "======================================================================================================" - echo "" - exit 1 - fi -else - echo "Looking for sed..." - if [ -z $(command -v sed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install sed on your system using your favourite package manager." - echo "" - echo " Restart after installing sed." - echo "======================================================================================================" - echo "" - exit 1 - fi -fi - -echo "Installing SDKMAN scripts..." - - -# Create directory structure - -echo "Create distribution directories..." -mkdir -p "$sdkman_tmp_folder" -mkdir -p "$sdkman_ext_folder" -mkdir -p "$sdkman_etc_folder" -mkdir -p "$sdkman_var_folder" -mkdir -p "$sdkman_archives_folder" -mkdir -p "$sdkman_candidates_folder" - -echo "Getting available candidates..." -SDKMAN_CANDIDATES_CSV=$(curl -s "${SDKMAN_SERVICE}/candidates/all") -echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" - -echo "Prime the config file..." -touch "$sdkman_config_file" -echo "sdkman_auto_answer=false" >> "$sdkman_config_file" -if [ -z "$ZSH_VERSION" -a -z "$BASH_VERSION" ]; then - echo "sdkman_auto_complete=false" >> "$sdkman_config_file" -else - echo "sdkman_auto_complete=true" >> "$sdkman_config_file" -fi -echo "sdkman_auto_env=false" >> "$sdkman_config_file" -echo "sdkman_auto_update=true" >> "$sdkman_config_file" -echo "sdkman_beta_channel=false" >> "$sdkman_config_file" -echo "sdkman_checksum_enable=true" >> "$sdkman_config_file" -echo "sdkman_colour_enable=true" >> "$sdkman_config_file" -echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file" -echo "sdkman_curl_max_time=10" >> "$sdkman_config_file" -echo "sdkman_debug_mode=false" >> "$sdkman_config_file" -echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file" -echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file" -echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file" - -echo "Download script archive..." -curl --location --progress-bar "${SDKMAN_SERVICE}/broker/download/sdkman/install/${SDKMAN_VERSION}/${SDKMAN_PLATFORM}" > "$sdkman_zip_file" - -ARCHIVE_OK=$(unzip -qt "$sdkman_zip_file" | grep 'No errors detected in compressed data') -if [[ -z "$ARCHIVE_OK" ]]; then - echo "Downloaded zip archive corrupt. Are you connected to the internet?" - echo "" - echo "If problems persist, please ask for help on our Slack:" - echo "* easy sign up: https://slack.sdkman.io/" - echo "* report on channel: https://sdkman.slack.com/app_redirect?channel=user-issues" - rm -rf "$SDKMAN_DIR" - exit 1 -fi - -echo "Extract script archive..." -if [[ "$cygwin" == 'true' ]]; then - echo "Cygwin detected - normalizing paths for unzip..." - sdkman_tmp_folder=$(cygpath -w "$sdkman_tmp_folder") - sdkman_zip_file=$(cygpath -w "$sdkman_zip_file") - sdkman_zip_base_folder=$(cygpath -w "$sdkman_zip_base_folder") -fi -unzip -qo "$sdkman_zip_file" -d "$sdkman_tmp_folder" - -echo "Install scripts..." -mv "${sdkman_zip_base_folder}/"* "$SDKMAN_DIR" -rm -rf "$sdkman_zip_base_folder" - -echo "Set version to $SDKMAN_VERSION ..." -echo "$SDKMAN_VERSION" > "${SDKMAN_DIR}/var/version" - - -if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" - echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" - echo "Added sdkman init snippet to $sdkman_bash_profile" - fi -else - echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" - echo "Added sdkman init snippet to $sdkman_bashrc" - fi -fi - -echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" - echo "Updated existing ${sdkman_zshrc}" -fi - - - -echo -e "\n\n\nAll done!\n\n" - -echo "You are subscribed to the STABLE channel." - -echo "" -echo "Please open a new terminal, or run the following in the existing one:" -echo "" -echo " source \"${SDKMAN_DIR}/bin/sdkman-init.sh\"" -echo "" -echo "Then issue the following command:" -echo "" -echo " sdk help" -echo "" -echo "Enjoy!!!" diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk8/Dockerfile b/linux/obsolete/teamcity/agent/android-sdk/jdk8/Dockerfile deleted file mode 100644 index cbe780ff6..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk8/Dockerfile +++ /dev/null @@ -1,560 +0,0 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest-jdk8 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ENV ANDROID_HOME=/usr/lib/android-sdk -ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk - -ENV PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin - -################################################################## -# Android SDK -################################################################## -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - android-sdk \ - sdkmanager \ - android-sdk-build-tools \ - android-sdk-platform-tools-common \ - android-sdk-platform-tools \ - adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ - apt remove -y gradle && \ - sdkmanager --version && \ - mvn -v - -# Install ALL ANDROID SDK -RUN sdkmanager --install \ -# "build-tools;17.0.0" \ -# "build-tools;18.0.0" \ -# "build-tools;18.0.1" \ -# "build-tools;18.1.0" \ -# "build-tools;18.1.1" \ -# "build-tools;19.0.0" \ -# "build-tools;19.0.1" \ -# "build-tools;19.0.2" \ -# "build-tools;19.0.3" \ -# "build-tools;19.1.0" \ -# "build-tools;20.0.0" \ -# "build-tools;21.0.0" \ -# "build-tools;21.0.1" \ -# "build-tools;21.0.2" \ -# "build-tools;21.1.0" \ -# "build-tools;21.1.1" \ -# "build-tools;21.1.2" \ -# "build-tools;22.0.0" \ -# "build-tools;22.0.1" \ -# "build-tools;23.0.0" \ -# "build-tools;23.0.1" \ -# "build-tools;23.0.2" \ -# "build-tools;23.0.3" \ -# "build-tools;24.0.0" \ -# "build-tools;24.0.1" \ -# "build-tools;24.0.2" \ -# "build-tools;24.0.3" \ -# "build-tools;25.0.0" \ -# "build-tools;25.0.1" \ -# "build-tools;25.0.2" \ -# "build-tools;25.0.3" \ -# "build-tools;26.0.0" \ -# "build-tools;26.0.0-rc1" \ -# "build-tools;26.0.0-rc2" \ -# "build-tools;26.0.1" \ -# "build-tools;26.0.2" \ -# "build-tools;26.0.3" \ -# "build-tools;27.0.0" \ -# "build-tools;27.0.1" \ -# "build-tools;27.0.2" \ -# "build-tools;27.0.3" \ -# "build-tools;28.0.0" \ -# "build-tools;28.0.0-rc1" \ -# "build-tools;28.0.0-rc2" \ -# "build-tools;28.0.1" \ -# "build-tools;28.0.2" \ -# "build-tools;28.0.3" \ -# "build-tools;29.0.0" \ -# "build-tools;29.0.0-rc1" \ -# "build-tools;29.0.0-rc2" \ -# "build-tools;29.0.0-rc3" \ -# "build-tools;29.0.1" \ -# "build-tools;29.0.2" \ -# "build-tools;29.0.3" \ -# "build-tools;30.0.0" \ -# "build-tools;30.0.0-rc1" \ -# "build-tools;30.0.0-rc2" \ -# "build-tools;30.0.0-rc3" \ -# "build-tools;30.0.0-rc4" \ -# "build-tools;30.0.1" \ -# "build-tools;30.0.2" \ -# "build-tools;30.0.3" \ -# "build-tools;31.0.0" \ -# "build-tools;31.0.0-rc1" \ -# "build-tools;31.0.0-rc2" \ -# "build-tools;31.0.0-rc3" \ -# "build-tools;31.0.0-rc4" \ -# "build-tools;31.0.0-rc5" \ -# "build-tools;32.0.0" \ -# "build-tools;32.1.0-rc1" \ -# "build-tools;33.0.0" \ -# "build-tools;33.0.0-rc1" \ -# "build-tools;33.0.0-rc2" \ -# "build-tools;33.0.0-rc3" \ -# "build-tools;33.0.0-rc4" \ -# "build-tools;33.0.1" \ -# "build-tools;33.0.2" \ -# "build-tools;34.0.0" \ -# "build-tools;34.0.0-rc1" \ -# "build-tools;34.0.0-rc2" \ -# "build-tools;34.0.0-rc3" \ - "build-tools;34.0.0-rc4" - -RUN sdkmanager --install \ - "cmake;3.10.2.4988404" \ - "cmake;3.18.1" \ - "cmake;3.22.1" \ - "cmake;3.6.4111459" - -RUN sdkmanager --install \ -# "cmdline-tools;1.0" \ -# "cmdline-tools;1.0-alpha01" \ -# "cmdline-tools;10.0-beta04" \ -# "cmdline-tools;11.0-alpha07" \ -# "cmdline-tools;2.0" \ -# "cmdline-tools;2.0-rc01" \ -# "cmdline-tools;2.1" \ -# "cmdline-tools;3.0" \ -# "cmdline-tools;3.0-beta01" \ -# "cmdline-tools;4.0" \ -# "cmdline-tools;4.0-alpha02" \ -# "cmdline-tools;4.0-beta01" \ -# "cmdline-tools;5.0" \ -# "cmdline-tools;5.0-alpha01" \ -# "cmdline-tools;6.0" \ -# "cmdline-tools;7.0" \ -# "cmdline-tools;8.0" \ -# "cmdline-tools;9.0" \ - "cmdline-tools;latest" - -RUN sdkmanager --install \ - "extras;android;m2repository" \ -# "extras;android;m2repository;01" \ -# "extras;android;m2repository;02" \ -# "extras;android;m2repository;03" \ -# "extras;android;m2repository;04" \ -# "extras;android;m2repository;06" \ -# "extras;android;m2repository;07" \ -# "extras;android;m2repository;08" \ -# "extras;android;m2repository;09" \ -# "extras;android;m2repository;1" \ -# "extras;android;m2repository;2" \ -# "extras;android;m2repository;3" \ -# "extras;android;m2repository;4" \ -# "extras;android;m2repository;6" \ -# "extras;android;m2repository;7" \ -# "extras;android;m2repository;8" \ -# "extras;android;m2repository;9" \ -# "extras;android;m2repository;10" \ -# "extras;android;m2repository;11" \ -# "extras;android;m2repository;12" \ -# "extras;android;m2repository;13" \ -# "extras;android;m2repository;14" \ -# "extras;android;m2repository;15" \ -# "extras;android;m2repository;16" \ -# "extras;android;m2repository;17" \ -# "extras;android;m2repository;18" \ -# "extras;android;m2repository;19" \ -# "extras;android;m2repository;20" \ -# "extras;android;m2repository;21" \ -# "extras;android;m2repository;22" \ -# "extras;android;m2repository;23" \ -# "extras;android;m2repository;24" \ -# "extras;android;m2repository;25" \ -# "extras;android;m2repository;26" \ -# "extras;android;m2repository;27" \ -# "extras;android;m2repository;28" \ -# "extras;android;m2repository;29" \ -# "extras;android;m2repository;30" \ -# "extras;android;m2repository;31" \ -# "extras;android;m2repository;32" \ -# "extras;android;m2repository;33" \ -# "extras;android;m2repository;34" \ -# "extras;android;m2repository;35" \ -# "extras;android;m2repository;36" \ -# "extras;android;m2repository;37" \ -# "extras;android;m2repository;38" \ -# "extras;android;m2repository;39" \ -# "extras;android;m2repository;40" \ -# "extras;android;m2repository;41" \ -# "extras;android;m2repository;42" \ -# "extras;android;m2repository;43" \ -# "extras;android;m2repository;44" \ -# "extras;android;m2repository;45" \ -# "extras;android;m2repository;46" \ - "extras;android;m2repository;47" - -RUN sdkmanager --install \ - "platform-tools" \ -# "platform-tools;24.0.0" \ -# "platform-tools;29.0.5" \ -# "platform-tools;29.0.6" \ -# "platform-tools;30.0.0" \ -# "platform-tools;30.0.1" \ -# "platform-tools;30.0.2" \ -# "platform-tools;30.0.3" \ -# "platform-tools;30.0.4" \ -# "platform-tools;30.0.5" \ -# "platform-tools;31.0.0" \ -# "platform-tools;31.0.1" \ -# "platform-tools;31.0.2" \ -# "platform-tools;31.0.3" \ -# "platform-tools;32.0.0" \ -# "platform-tools;33.0.0" \ -# "platform-tools;33.0.1" \ -# "platform-tools;33.0.2" \ -# "platform-tools;33.0.3" \ -# "platform-tools;34.0.0" \ -# "platform-tools;34.0.1" \ - "platform-tools;34.0.3" - -RUN sdkmanager --install \ -# "platforms;android-1" \ -# "platforms;android-2" \ -# "platforms;android-3" \ -# "platforms;android-4" \ -# "platforms;android-5" \ -# "platforms;android-6" \ -# "platforms;android-7" \ -# "platforms;android-8" \ -# "platforms;android-9" \ -# "platforms;android-10" \ -# "platforms;android-11" \ -# "platforms;android-12" \ -# "platforms;android-13" \ -# "platforms;android-14" \ -# "platforms;android-15" \ -# "platforms;android-16" \ -# "platforms;android-17" \ -# "platforms;android-18" \ -# "platforms;android-19" \ -# "platforms;android-20" \ -# "platforms;android-21" \ -# "platforms;android-22" \ -# "platforms;android-23" \ -# "platforms;android-24" \ -# "platforms;android-25" \ -# "platforms;android-26" \ -# "platforms;android-27" \ -# "platforms;android-28" \ -# "platforms;android-29" \ -# "platforms;android-30" \ -# "platforms;android-31" \ -# "platforms;android-32" \ -# "platforms;android-33" \ -# "platforms;android-34" \ - "platforms;android-35" - -RUN sdkmanager --install \ -# "ndk-bundle;11.0.2655954" \ -# "ndk-bundle;11.1.2683735" \ -# "ndk-bundle;11.2.2725575" \ -# "ndk-bundle;12.0.2931149" \ -# "ndk-bundle;12.1.2977051" \ -# "ndk-bundle;13.0.3315539" \ -# "ndk-bundle;13.1.3345770" \ -# "ndk-bundle;14.0.3770861" \ -# "ndk-bundle;14.1.3816874" \ -# "ndk-bundle;15.0.4075724" \ -# "ndk-bundle;15.1.4119039" \ -# "ndk-bundle;15.2.4203891" \ -# "ndk-bundle;16.0.4442984" \ -# "ndk-bundle;16.1.4479499" \ -# "ndk-bundle;17.0.4754217" \ -# "ndk-bundle;17.1.4828580" \ -# "ndk-bundle;17.2.4988734" \ -# "ndk-bundle;18.1.5063045" \ -# "ndk-bundle;19.0.5232133" \ -# "ndk-bundle;19.1.5304403" \ -# "ndk-bundle;19.2.5345600" \ -# "ndk-bundle;20.0.5392854-beta2" \ -# "ndk-bundle;20.0.5471264-beta3" \ -# "ndk-bundle;20.0.5594570" \ -# "ndk-bundle;20.1.5948944" \ -# "ndk-bundle;21.0.6011959-beta2" \ -# "ndk-bundle;21.0.6113669" \ -# "ndk-bundle;21.1.6210238-beta1" \ -# "ndk-bundle;21.1.6273396-beta2" \ -# "ndk-bundle;21.1.6352462" \ -# "ndk-bundle;21.1.6363665-beta3" \ -# "ndk-bundle;21.2.6472646" \ -# "ndk-bundle;21.3.6528147" \ -# "ndk-bundle;21.4.7075529" \ -# "ndk-bundle;22.0.6917172-beta1" \ -# "ndk-bundle;22.0.7026061" \ -# "ndk-bundle;22.1.7171670" \ -# "ndk-bundle;23.0.7123448-beta1" \ -# "ndk-bundle;23.0.7196353-beta2" \ -# "ndk-bundle;23.0.7272597-beta3" \ -# "ndk-bundle;23.0.7344513-beta4" \ -# "ndk-bundle;23.0.7421159-beta5" \ -# "ndk-bundle;23.0.7530507-beta6" \ -# "ndk-bundle;23.0.7599858" \ -# "ndk-bundle;23.1.7779620" \ -# "ndk-bundle;23.2.8568313" \ -# "ndk-bundle;24.0.7856742-beta1" \ -# "ndk-bundle;24.0.7956693-beta2" \ -# "ndk-bundle;24.0.8079956-beta3" \ -# "ndk-bundle;24.0.8215888" \ -# "ndk-bundle;25.0.8141415-beta1" \ -# "ndk-bundle;25.0.8221429-beta2" \ -# "ndk-bundle;25.0.8355429-beta3" \ -# "ndk-bundle;25.0.8528842-beta4" \ -# "ndk-bundle;25.0.8775105" \ -# "ndk-bundle;25.1.8937393" \ - "ndk-bundle;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk-bundle;r10e" \ -# "ndk-bundle;r11" \ -# "ndk-bundle;r11b" \ -# "ndk-bundle;r11c" \ -# "ndk-bundle;r12" \ -# "ndk-bundle;r12b" \ -# "ndk-bundle;r13" \ -# "ndk-bundle;r13b" \ -# "ndk-bundle;r14" \ -# "ndk-bundle;r14b" \ -# "ndk-bundle;r15" \ -# "ndk-bundle;r15b" \ -# "ndk-bundle;r15c" \ -# "ndk-bundle;r16" \ -# "ndk-bundle;r16b" \ -# "ndk-bundle;r17" \ -# "ndk-bundle;r17b" \ -# "ndk-bundle;r17c" \ -# "ndk-bundle;r18b" \ -# "ndk-bundle;r19" \ -# "ndk-bundle;r19b" \ -# "ndk-bundle;r19c" \ -# "ndk-bundle;r20" \ -# "ndk-bundle;r20-beta2" \ -# "ndk-bundle;r20-beta3" \ -# "ndk-bundle;r20b" \ -# "ndk-bundle;r21" \ -# "ndk-bundle;r21-beta2" \ -# "ndk-bundle;r21b" \ -# "ndk-bundle;r21b-beta1" \ -# "ndk-bundle;r21b-beta2" \ -# "ndk-bundle;r21b-beta3" \ -# "ndk-bundle;r21c" \ -# "ndk-bundle;r21d" \ -# "ndk-bundle;r21e" \ -# "ndk-bundle;r22" \ -# "ndk-bundle;r22-beta1" \ -# "ndk-bundle;r22b" \ -# "ndk-bundle;r23" \ -# "ndk-bundle;r23-beta1" \ -# "ndk-bundle;r23-beta2" \ -# "ndk-bundle;r23-beta3" \ -# "ndk-bundle;r23-beta4" \ -# "ndk-bundle;r23-beta5" \ -# "ndk-bundle;r23-beta6" \ -# "ndk-bundle;r23b" \ -# "ndk-bundle;r23c" \ -# "ndk-bundle;r24" \ -# "ndk-bundle;r24-beta1" \ -# "ndk-bundle;r24-beta2" \ -# "ndk-bundle;r24-rc1" \ - "ndk-bundle;r25" \ -# "ndk-bundle;r25-beta1" \ -# "ndk-bundle;r25-beta2" \ -# "ndk-bundle;r25-beta3" \ -# "ndk-bundle;r25-beta4" \ -# "ndk-bundle;r25b" \ - "ndk-bundle;r25c" - -RUN sdkmanager --install \ -# "ndk;11.0.2655954" \ -# "ndk;11.1.2683735" \ -# "ndk;11.2.2725575" \ -# "ndk;12.0.2931149" \ -# "ndk;12.1.2977051" \ -# "ndk;13.0.3315539" \ -# "ndk;13.1.3345770" \ -# "ndk;14.0.3770861" \ -# "ndk;14.1.3816874" \ -# "ndk;15.0.4075724" \ -# "ndk;15.1.4119039" \ -# "ndk;15.2.4203891" \ -# "ndk;16.0.4442984" \ -# "ndk;16.1.4479499" \ -# "ndk;17.0.4754217" \ -# "ndk;17.1.4828580" \ -# "ndk;17.2.4988734" \ -# "ndk;18.1.5063045" \ -# "ndk;19.0.5232133" \ -# "ndk;19.1.5304403" \ -# "ndk;19.2.5345600" \ -# "ndk;20.0.5392854-beta2" \ -# "ndk;20.0.5471264-beta3" \ -# "ndk;20.0.5594570" \ -# "ndk;20.1.5948944" \ -# "ndk;21.0.6011959-beta2" \ -# "ndk;21.0.6113669" \ -# "ndk;21.1.6210238-beta1" \ -# "ndk;21.1.6273396-beta2" \ -# "ndk;21.1.6352462" \ -# "ndk;21.1.6363665-beta3" \ -# "ndk;21.2.6472646" \ -# "ndk;21.3.6528147" \ -# "ndk;21.4.7075529" \ -# "ndk;22.0.6917172-beta1" \ -# "ndk;22.0.7026061" \ -# "ndk;22.1.7171670" \ -# "ndk;23.0.7123448-beta1" \ -# "ndk;23.0.7196353-beta2" \ -# "ndk;23.0.7272597-beta3" \ -# "ndk;23.0.7344513-beta4" \ -# "ndk;23.0.7421159-beta5" \ -# "ndk;23.0.7530507-beta6" \ -# "ndk;23.0.7599858" \ -# "ndk;23.1.7779620" \ -# "ndk;23.2.8568313" \ -# "ndk;24.0.7856742-beta1" \ -# "ndk;24.0.7956693-beta2" \ -# "ndk;24.0.8079956-beta3" \ -# "ndk;24.0.8215888" \ -# "ndk;25.0.8141415-beta1" \ -# "ndk;25.0.8221429-beta2" \ -# "ndk;25.0.8355429-beta3" \ -# "ndk;25.0.8528842-beta4" \ -# "ndk;25.0.8775105" \ -# "ndk;25.1.8937393" \ - "ndk;25.2.9519653" - -RUN sdkmanager --install \ -# "ndk;r10e" \ -# "ndk;r11" \ -# "ndk;r11b" \ -# "ndk;r11c" \ -# "ndk;r12" \ -# "ndk;r12b" \ -# "ndk;r13" \ -# "ndk;r13b" \ -# "ndk;r14" \ -# "ndk;r14b" \ -# "ndk;r15" \ -# "ndk;r15b" \ -# "ndk;r15c" \ -# "ndk;r16" \ -# "ndk;r16b" \ -# "ndk;r17" \ -# "ndk;r17b" \ -# "ndk;r17c" \ -# "ndk;r18b" \ -# "ndk;r19" \ -# "ndk;r19b" \ -# "ndk;r19c" \ -# "ndk;r20" \ -# "ndk;r20-beta2" \ -# "ndk;r20-beta3" \ -# "ndk;r20b" \ -# "ndk;r21" \ -# "ndk;r21-beta2" \ -# "ndk;r21b" \ -# "ndk;r21b-beta1" \ -# "ndk;r21b-beta2" \ -# "ndk;r21b-beta3" \ -# "ndk;r21c" \ -# "ndk;r21d" \ -# "ndk;r21e" \ -# "ndk;r22" \ -# "ndk;r22-beta1" \ -# "ndk;r22b" \ -# "ndk;r23" \ -# "ndk;r23-beta1" \ -# "ndk;r23-beta2" \ -# "ndk;r23-beta3" \ -# "ndk;r23-beta4" \ -# "ndk;r23-beta5" \ -# "ndk;r23-beta6" \ -# "ndk;r23b" \ -# "ndk;r23c" \ -# "ndk;r24" \ -# "ndk;r24-beta1" \ -# "ndk;r24-beta2" \ -# "ndk;r24-rc1" \ - "ndk;r25" \ -# "ndk;r25-beta1" \ -# "ndk;r25-beta2" \ -# "ndk;r25-beta3" \ -# "ndk;r25-beta4" \ -# "ndk;r25b" \ - "ndk;r25c" - -RUN sdkmanager --install \ - "tools" \ -# "tools;20.0.1" \ -# "tools;20.0.3" \ -# "tools;21.0.1" \ -# "tools;22.0.1" \ -# "tools;22.0.4" \ -# "tools;22.0.5" \ -# "tools;22.2.1" \ -# "tools;22.6.1" \ -# "tools;22.6.2" \ -# "tools;22.6.3" \ -# "tools;22.6.4" \ -# "tools;23.0.1" \ -# "tools;23.0.2" \ -# "tools;23.0.4" \ -# "tools;23.0.5" \ -# "tools;24.0.1" \ -# "tools;24.0.2" \ -# "tools;24.1.2" \ -# "tools;24.3.1" \ -# "tools;24.3.2" \ -# "tools;24.3.3" \ -# "tools;24.3.4" \ -# "tools;24.4.1" \ -# "tools;25.0.1" \ -# "tools;25.0.2" \ -# "tools;25.0.3" \ -# "tools;25.0.4" \ -# "tools;25.0.5" \ -# "tools;25.0.6" \ -# "tools;25.0.7" \ -# "tools;25.0.8" \ -# "tools;25.0.9" \ -# "tools;25.1.0" \ -# "tools;25.1.1" \ -# "tools;25.1.2" \ -# "tools;25.1.3" \ -# "tools;25.1.4" \ -# "tools;25.1.5" \ -# "tools;25.1.6" \ -# "tools;25.1.7" \ -# "tools;25.2.1" \ -# "tools;25.2.2" \ -# "tools;25.2.3" \ -# "tools;25.2.4" \ -# "tools;25.2.5" \ - "tools;25.2.5" -# "tools;26.1.1" - -# Activate android sdk -#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license -#RUN rm -rfv /usr/lib/android-sdk/licenses/* -RUN yes | sdkmanager --licenses -RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk8/docker-compose.yml b/linux/obsolete/teamcity/agent/android-sdk/jdk8/docker-compose.yml deleted file mode 100644 index 0e9c9b2e6..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk8/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - app: - image: "hub.epicm.org/epicmorg/teamcity-agent:android-sdk-jdk8" - build: - context: . diff --git a/linux/obsolete/teamcity/agent/android-sdk/jdk8/sdkman.sh b/linux/obsolete/teamcity/agent/android-sdk/jdk8/sdkman.sh deleted file mode 100755 index 59b74df1e..000000000 --- a/linux/obsolete/teamcity/agent/android-sdk/jdk8/sdkman.sh +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Marco Vermeulen -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# install:- channel: stable; cliVersion: 5.15.0; cliNativeVersion: NA; api: https://api.sdkman.io/2 - -# Global variables -SDKMAN_SERVICE="https://api.sdkman.io/2" -SDKMAN_VERSION="5.15.0" -SDKMAN_PLATFORM=$(uname) - -if [ -z "$SDKMAN_DIR" ]; then - SDKMAN_DIR="$HOME/.sdkman" - SDKMAN_DIR_RAW='$HOME/.sdkman' -else - SDKMAN_DIR_RAW="$SDKMAN_DIR" -fi - -# Local variables -sdkman_tmp_folder="${SDKMAN_DIR}/tmp" -sdkman_zip_file="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}.zip" -sdkman_zip_base_folder="${sdkman_tmp_folder}/sdkman-${SDKMAN_VERSION}" -sdkman_ext_folder="${SDKMAN_DIR}/ext" -sdkman_etc_folder="${SDKMAN_DIR}/etc" -sdkman_var_folder="${SDKMAN_DIR}/var" -sdkman_archives_folder="${SDKMAN_DIR}/archives" -sdkman_candidates_folder="${SDKMAN_DIR}/candidates" -sdkman_config_file="${sdkman_etc_folder}/config" -sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" -sdkman_bashrc="${HOME}/.bashrc" -sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc" - -sdkman_init_snippet=$( cat << EOF -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$SDKMAN_DIR_RAW" -[[ -s "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR_RAW}/bin/sdkman-init.sh" -EOF -) - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -solaris=false; -freebsd=false; -case "$(uname)" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - SunOS*) - solaris=true - ;; - FreeBSD*) - freebsd=true -esac - -echo '' -echo ' -+syyyyyyys:' -echo ' `/yho:` -yd.' -echo ' `/yh/` +m.' -echo ' .oho. hy .`' -echo ' .sh/` :N` `-/o` `+dyyo:.' -echo ' .yh:` `M- `-/osysoym :hs` `-+sys: hhyssssssssy+' -echo ' .sh:` `N: ms/-`` yy.yh- -hy. `.N-````````+N.' -echo ' `od/` `N- -/oM- ddd+` `sd: hNNm -N:' -echo ' :do` .M. dMMM- `ms. /d+` `NMMs `do' -echo ' .yy- :N` ```mMMM. - -hy. /MMM: yh' -echo ' `+d+` `:/oo/` `-/osyh/ossssssdNMM` .sh: yMMN` /m.' -echo ' -dh- :ymNMMMMy `-/shmNm-`:N/-.`` `.sN /N- `NMMy .m/' -echo ' `oNs` -hysosmMMMMydmNmds+-.:ohm : sd` :MMM/ yy' -echo ' .hN+ /d: -MMMmhs/-.` .MMMh .ss+- `yy` sMMN` :N.' -echo ' :mN/ `N/ `o/-` :MMMo +MMMN- .` `ds mMMh do' -echo ' /NN/ `N+....--:/+oooosooo+:sMMM: hMMMM: `my .m+ -MMM+ :N.' -echo ' /NMo -+ooooo+/:-....`...:+hNMN. `NMMMd` .MM/ -m: oMMN. hs' -echo ' -NMd` :mm -MMMm- .s/ -MMm. /m- mMMd -N.' -echo ' `mMM/ .- /MMh. -dMo -MMMy od. .MMMs..---yh' -echo ' +MMM. sNo`.sNMM+ :MMMM/ sh`+MMMNmNm+++-' -echo ' mMMM- /--ohmMMM+ :MMMMm. `hyymmmdddo' -echo ' MMMMh. ```` `-+yy/`yMMM/ :MMMMMy -sm:.``..-:-.`' -echo ' dMMMMmo-.``````..-:/osyhddddho. `+shdh+. hMMM: :MmMMMM/ ./yy/` `:sys+/+sh/' -echo ' .dMMMMMMmdddddmmNMMMNNNNNMMMMMs sNdo- dMMM- `-/yd/MMMMm-:sy+. :hs- /N`' -echo ' `/ymNNNNNNNmmdys+/::----/dMMm: +m- mMMM+ohmo/.` sMMMMdo- .om: `sh' -echo ' `.-----+/.` `.-+hh/` `od. NMMNmds/ `mmy:` +mMy `:yy.' -echo ' /moyso+//+ossso:. .yy` `dy+:` .. :MMMN+---/oys:' -echo ' /+m: `.-:::-` /d+ +MMMMMMMNh:`' -echo ' +MN/ -yh. `+hddhy+.' -echo ' /MM+ .sh:' -echo ' :NMo -sh/' -echo ' -NMs `/yy:' -echo ' .NMy `:sh+.' -echo ' `mMm` ./yds-' -echo ' `dMMMmyo:-.````.-:oymNy:`' -echo ' +NMMMMMMMMMMMMMMMMms:`' -echo ' -+shmNMMMNmdy+:`' -echo '' -echo '' -echo ' Now attempting installation...' -echo '' -echo '' - -# Sanity checks - -echo "Looking for a previous installation of SDKMAN..." -if [ -d "$SDKMAN_DIR" ]; then - echo "SDKMAN found." - echo "" - echo "======================================================================================================" - echo " You already have SDKMAN installed." - echo " SDKMAN was found at:" - echo "" - echo " ${SDKMAN_DIR}" - echo "" - echo " Please consider running the following if you need to upgrade." - echo "" - echo " $ sdk selfupdate force" - echo "" - echo "======================================================================================================" - echo "" - exit 0 -fi - -echo "Looking for unzip..." -if ! command -v unzip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install unzip on your system using your favourite package manager." - echo "" - echo " Restart after installing unzip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for zip..." -if ! command -v zip > /dev/null; then - echo "Not found." - echo "======================================================================================================" - echo " Please install zip on your system using your favourite package manager." - echo "" - echo " Restart after installing zip." - echo "======================================================================================================" - echo "" - exit 1 -fi - -echo "Looking for curl..." -if ! command -v curl > /dev/null; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install curl on your system using your favourite package manager." - echo "" - echo " Restart after installing curl." - echo "======================================================================================================" - echo "" - exit 1 -fi - -if [[ "$solaris" == true ]]; then - echo "Looking for gsed..." - if [ -z $(which gsed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install gsed on your solaris system." - echo "" - echo " SDKMAN uses gsed extensively." - echo "" - echo " Restart after installing gsed." - echo "======================================================================================================" - echo "" - exit 1 - fi -else - echo "Looking for sed..." - if [ -z $(command -v sed) ]; then - echo "Not found." - echo "" - echo "======================================================================================================" - echo " Please install sed on your system using your favourite package manager." - echo "" - echo " Restart after installing sed." - echo "======================================================================================================" - echo "" - exit 1 - fi -fi - -echo "Installing SDKMAN scripts..." - - -# Create directory structure - -echo "Create distribution directories..." -mkdir -p "$sdkman_tmp_folder" -mkdir -p "$sdkman_ext_folder" -mkdir -p "$sdkman_etc_folder" -mkdir -p "$sdkman_var_folder" -mkdir -p "$sdkman_archives_folder" -mkdir -p "$sdkman_candidates_folder" - -echo "Getting available candidates..." -SDKMAN_CANDIDATES_CSV=$(curl -s "${SDKMAN_SERVICE}/candidates/all") -echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" - -echo "Prime the config file..." -touch "$sdkman_config_file" -echo "sdkman_auto_answer=false" >> "$sdkman_config_file" -if [ -z "$ZSH_VERSION" -a -z "$BASH_VERSION" ]; then - echo "sdkman_auto_complete=false" >> "$sdkman_config_file" -else - echo "sdkman_auto_complete=true" >> "$sdkman_config_file" -fi -echo "sdkman_auto_env=false" >> "$sdkman_config_file" -echo "sdkman_auto_update=true" >> "$sdkman_config_file" -echo "sdkman_beta_channel=false" >> "$sdkman_config_file" -echo "sdkman_checksum_enable=true" >> "$sdkman_config_file" -echo "sdkman_colour_enable=true" >> "$sdkman_config_file" -echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file" -echo "sdkman_curl_max_time=10" >> "$sdkman_config_file" -echo "sdkman_debug_mode=false" >> "$sdkman_config_file" -echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file" -echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file" -echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file" - -echo "Download script archive..." -curl --location --progress-bar "${SDKMAN_SERVICE}/broker/download/sdkman/install/${SDKMAN_VERSION}/${SDKMAN_PLATFORM}" > "$sdkman_zip_file" - -ARCHIVE_OK=$(unzip -qt "$sdkman_zip_file" | grep 'No errors detected in compressed data') -if [[ -z "$ARCHIVE_OK" ]]; then - echo "Downloaded zip archive corrupt. Are you connected to the internet?" - echo "" - echo "If problems persist, please ask for help on our Slack:" - echo "* easy sign up: https://slack.sdkman.io/" - echo "* report on channel: https://sdkman.slack.com/app_redirect?channel=user-issues" - rm -rf "$SDKMAN_DIR" - exit 1 -fi - -echo "Extract script archive..." -if [[ "$cygwin" == 'true' ]]; then - echo "Cygwin detected - normalizing paths for unzip..." - sdkman_tmp_folder=$(cygpath -w "$sdkman_tmp_folder") - sdkman_zip_file=$(cygpath -w "$sdkman_zip_file") - sdkman_zip_base_folder=$(cygpath -w "$sdkman_zip_base_folder") -fi -unzip -qo "$sdkman_zip_file" -d "$sdkman_tmp_folder" - -echo "Install scripts..." -mv "${sdkman_zip_base_folder}/"* "$SDKMAN_DIR" -rm -rf "$sdkman_zip_base_folder" - -echo "Set version to $SDKMAN_VERSION ..." -echo "$SDKMAN_VERSION" > "${SDKMAN_DIR}/var/version" - - -if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" - echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" - echo "Added sdkman init snippet to $sdkman_bash_profile" - fi -else - echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" - echo "Added sdkman init snippet to $sdkman_bashrc" - fi -fi - -echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then - echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" - echo "Updated existing ${sdkman_zshrc}" -fi - - - -echo -e "\n\n\nAll done!\n\n" - -echo "You are subscribed to the STABLE channel." - -echo "" -echo "Please open a new terminal, or run the following in the existing one:" -echo "" -echo " source \"${SDKMAN_DIR}/bin/sdkman-init.sh\"" -echo "" -echo "Then issue the following command:" -echo "" -echo " sdk help" -echo "" -echo "Enjoy!!!" diff --git a/linux/obsolete/teamcity/agent/atlassian-sdk/Dockerfile b/linux/obsolete/teamcity/agent/atlassian-sdk/Dockerfile deleted file mode 100644 index cdbb4c866..000000000 --- a/linux/obsolete/teamcity/agent/atlassian-sdk/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# teamcity atlassian-sdk setup -################################################################## - -#Install packages -#RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contrib/a/atlassian-plugin-sdk/atlassian-plugin-sdk_8.0.16_all.deb -o /tmp/atlassian-plugin-sdk.deb && \ -# dpkg -i /tmp/atlassian-plugin-sdk.deb - -############################### -# https://community.atlassian.com/t5/Continuous-Delivery-questions/The-repository-https-packages-atlassian-com-atlassian-sdk-deb/qaq-p/1334014 -# -# https://community.developer.atlassian.com/t/the-repository-https-packages-atlassian-com-atlassian-sdk-deb-stable-release-is-not-signed/36901 -############################### -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 - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/obsolete/teamcity/agent/atlassian-sdk/etc/apt/keyrings/atlassian.asc b/linux/obsolete/teamcity/agent/atlassian-sdk/etc/apt/keyrings/atlassian.asc deleted file mode 100644 index c906eb35f..000000000 --- a/linux/obsolete/teamcity/agent/atlassian-sdk/etc/apt/keyrings/atlassian.asc +++ /dev/null @@ -1,86 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFjI3poBEADZReqFbIKxXzliXUM5YbEdd/pf2qzwltNYx4BenJELhEaGUXCL -kTu30cfQdLpzhqixd4sKwzcBtrA7F2bP8Xzu1Te1F3P0tL6DHuczgpoqG04nZZLA -8bBj4tfYeNv0YpXfKhFyHHUbXD3ZFHL71AF8O0G7U9mNFyKK1JL4sNMHnleI5tWU -rkXtpUbSCFIZx5qdh2dcmwEob6F0AfM+097fVGe5KC8JAzT81tr5mEp4G0orzkUW -Yi17jce2RC6def12aebPXAeYJlyXaKdssktqVnlz0Q9kDFys34ugyVzroQ41a9Rl -zrZ6NLknVYxSgdePTo2ys54wJi3TujWDuKCoiMJZ06Rh/WQxBz+WnYPwqmsftlMz -lVWPtL2SY4jJhoDtQl6LQjPd3jMPolWzxXlvGer+xo3hS8FwLAxzcWp5zRS5Fhum -6w0xYhtQJgqeiwaT1e5V31d6UektD1UayCg/GtFC3M1tPYI69X7aS2VhlYql7Gv/ -CGC0wZCfuJ6C8xHlxROlbYPZ9oEkaiE6cFmzWfVLtr1stO+8fiEgsJMS+tCaNwhd -LzkNnxIt8xN/CftuIE2YhwcxzAizfL7IcvoeNz6LlrdJWDntcs49GFqfWoNW7M6K -UjWnnZBTr8thGZOl8OB3KKZjM2bn5V9vI4fQ/S9v+NiU4Y6LRlcIbaIwiQARAQAB -tGJCdWlsZCBFbmdpbmVlcmluZyBUZWFtIChHUEcga2V5IHRvIHNpZ24gQXRsYXNz -aWFuIGRlYmlhbi95dW0gYXJ0aWZhY3RzKSA8YnVpbGQtdGVhbUBhdGxhc3NpYW4u -Y29tPokCOQQTAQgAIwUCWMjemgIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheA -AAoJELVslWWVdJW5DkoQAJpIzmjLGpqAO0PcCtmSMtvVIAnXQEFgKY1DTp7yfMdz -VdR3S58GVepWIUSZiVAPfzrpX6J7Nfeb4HUivGb89wxSLPgP+3RByVaW3hwh11H8 -SuO7q3rGAaT2DQUSafvdw9O22ssLrqmnV3LkLhF045XUv6Qrma88SQVCm8XpZ7JY -Cvaobz0083/mIQI3DjFMj7J69QpshVjcJnV9bRQrHAhF11eGCgOT9t7w4Iw35iqM -assSFihUNoVyWd6B+lrdY0yloqIMwXZT3Y+2F5J5IYzSQL8j6uBDWww/hfJL8iZC -k7kNZRvnyEfxBV2mQViawy42rTw9CpXpLwiNonWm871UEpr4P0OnAH1oqLdDbOO5 -XBmpDDoGorBzZ9cyWYWsh7o3aHwPjidwbBi+Wlm1DdbLNt4nbkovXEzvo1anyP8C -lnb0aayFugJvwZCWIINhXl2pMy8LD0cIsJ5u+lUlteiNqJHrNsEs5L/RqUT2/oJE -rQhoNDD45bi09RDijsErBH+0jmTJCA/Y/QF0aBIHMnUW/QJfTJtnKltt+kUinPwX -CBTpsXhFYhpPgC1RBZjeVEwNU3+JfWyvRVihG/bl+hhOxlRqecHzDsobdb94G+Pk -D+ik8CspQ35/w/VizNgiW/CCWOap2F7+AXkEWOFek0BdrvptTs9YpHXtLmLuQgAM -uQINBFjI3poBEADGFarW4ZTrWpb6jj6xNnkMYHbd+Fl90hNDumHQmNwyv4iDYto0 -p+CWng0ocSbN8LylKE+c/kFBvWOuDVxtosLt4RCbF5SLK3/kKND1y1XRnya3bOax -atA4U9vfcAxfoAp+7NXANi9gCWMr1rWvd6tKVYSTuG9EoFJWXtUsAeyUYEtbXwrn -zor70WI4j6GJnlnH35viIDMxkaBreKbcYkun3xa/3uzQxg620tcgqjsCKrcXxNMZ -tH3bnYsDinL3ikwSMU/uylzcq7RAU0rQ2L55us1DpOVEEFAH2vRLWcQwQYBUXGhi -0hxQJGlI5bYISTS67u5Vzlg8bPKHytAv7UZwWqEk8OhqaEWJmpoIfBz7RFALcZtg -WGrYbl22HO5zV/kf0Muh10cB8drKxk6zNl747+bQ1q7VZsZfrTU0jZd0ol/8XPmc -0uO59w514LfnUKgbgMgL2A0/TWPWJsOb/e0bPB28TdjB/QVTAED9/2B8h0w6Simo -xILWXG3po3VS3BZWpxH6bADNEoHFJsI37/T4LsjvlQgdk/9bUx9CKiOm6jKaHIqv -Y1ow5qsF58841e8Y09Kf93FooOtgl3tUUszuE2dY+3zyFcMeeySjreEUJTZR218d -u0yT1PbMEX0s8uO6IbXJ8diBU/iDfGoZpB/LnTPXLNGf5JSpoqOQqLntywARAQAB -iQIfBBgBCAAJBQJYyN6aAhsMAAoJELVslWWVdJW5O1gP/2rX+yWB/QcROXN0ZmMB -Tg4VU0X6TZMsp2cbkPBxcqLEumc3LGqM3IQdEuHiv3pjkq0CzrIT73YWD+86JRT1 -HS51mhMLUkw6WkqjWf5+ODzjLzqXt6oUEmSUBNR5gpIKCjOswXkqB5LJBanR7YS6 -fC+/BQLdLh8sQ9hJw3T6aABp/Yf0dEFEmZLL/r7DF1wZdg6qfSeukU6f8b0uo9un -fGCDn3FWEh5UunJ1Xxh+DnttnYRMkhvI3jIls7D8KggMhixdiFCMnuVtIzecyuU7 -jQBhQDwVkAtnIRex/pw4iv2J73q+YekEwI8IERykwaYuqM101QEbpMik9xtCPdoW -Nd5cXAx6WFsT6eeWe6NE5CphSATuhi7qRL3wScjT+OqoHX3Xr3QXXrBbQw5BR6R8 -YNPyev4ihuEArFml8gpXxYFN1CQBp/lfShzG4goLYji9xNGvr6r/mfADacI5CRQ9 -t7LSMJH+1ho3hrIBqF6oNjYyjOrvjMaNTMyS3Bq/2dCu29/083IZqFT4Uj30vYsN -49rXkC5M5DdCw1MhH10L9zrEswITMngNdWFT/LYXeeBvp7RvWG9AwWFguyMxbcmG -tvgk2bSRLlKcoQ78FKzmwhfe0NVg/5R9kTn45eU9RLIASgDnyaOw8EEbE3f6NiaJ -rbchfSKPy38kdMCUZcOHnAJDuQINBFjI3zMBEACtfn1/0UzrSZAVTbuCtTmNQ5J4 -Cq3JwS99rKFVmDAyKGHHKMaV39B14AoJTKXRGFI5CQSRV1dETu9K+0Gvv8AkjDcJ -3+ROpBJBqsPTrLmFoQxImoEZ1tki2kyYeGXlXmOe1VMxU3gRip4gzXGH5WGSIa/h -ydLXm1CkG0Uzczgf79Hes3XMDiQ8qgFuO/C0r08yeEfkzY7j55FZOS7j7Qltk5yU -pnU8fgDcZbBPfuo/YlEyalW3BC6ELMXDPY61g1AGmfbEboKa1xBiE32v0J9zj1QR -rsHxzmZZ65QbpONpJIyrop4WMXQURFd+r76FfpQBoSHg050iSWTDV8ySYk4V9LBU -5BYnIvu5pSjK2Qy25EfW3g5RCIeTScAXzslPwizIvkB97OfFb9krCGslX82bMRjA -tNN7abeQ8DVgxKAvVz7OxKpgPPS61+wnNdeNQYLVr6ckVYmfusO7wNdPBIixhaYQ -n1wZxnYhVdO538sq0g/tbFf87R1Ygx9S5CsHvbdr6oMk9oxFiwvaYwpiNhRa3k5k -KK2vSfqTqQyV6n+nFptyrpWw65plhbFtrAw6Mk/dfsev24HYOcc+FQ9fo7CaVh7q -hFj/AmVmeJXPfrKzWuQWBv6I35TXZpcS5bDjUerhjCFa/I3cy3AH8wpf9vZBwMLc -HI8TlGMgKQzDFbMSvwARAQABiQQ+BBgBCAAJBQJYyN8zAhsCAikJELVslWWVdJW5 -wV0gBBkBCAAGBQJYyN8zAAoJEDYLQ+tLJdhXPOYP/RSEpD9d+hT003v4GIBl/6dW -ObQ/inVPTE2J4xnl5VSFGFLLuC+Rto6eGswDqpDWRYmnLctEUUFdkNvE+bQu4BIF -F6jR5Gn8qm1Ou1xisVFIEHIkNgoinIs7BCVlzCreGL0TIsPEpB2mRdD/ayr3OsZW -evJ7qXOMR+kiQ1d2kiGC6YAHT8cyb0R407gZSTGYtmHfuZ7aiE1DhSOD1bOiiYKY -K4FlY0a/U9JPdDHM9y4dHMblv+yQwcPbb2+oLEEuYcqnX3unLq58TR8betzNFwJ4 -iNdEb3UqPpg6o5U1RFbSCHzScal8Ly9mkzp1IC+kST35PTLP6oPgtdBkxQqGwtV9 -B2OOJPZGnhNVjjAMEhDfMHSHAaH2hpxZvH3tvlJjAayalANWGb4iUgjTIZ0Auoy8 -agCjdEKhcCfqwTMSf3++b1bY/5/aGT6FAvhHWjSOGoBaTXH+pXxCCEsRBThELjMo -hTNjGSIS3tnyJK+NpMoZm1evBTCz/fWTmGseY9PrH3P4vXtIzH8ImTAmvQX/EIHL -Nnm6VoSjM1EdgeVHN8mfeVSqoC/yWMvwVqyzxG+rfwhAvRYseK5RDS5ErIM/FPT/ -zHaMn3FJhBBHzhaw8vAQKpbufc/fe35MujHvwRHQsoWRIysDWHC+7D+adAPzQuEO -gYYYLD0avCsKaoRJ1uErE9MP/2f9+ZONtSy3W4InlhTl+N6G547bdiQbTvdqoFMe -ec0K8NowBFhul/j5AUBbW2snAN8j9REYigQZrestVazsQPwdEFtog99N6hKRSV/u -xBGgx3Fx643wQez4JYOA0qxub4qeHfIc9yPecHjuz5qD4yFI/nR869VXLkhlBleE -gw9MDgtrc0Syqc1pr5/EKih8ZRHAWzNGpdKhXN5+1hwpPlmq3pp2hsZDgJ/Qi9yx -r6cRIHLIKOCqWioJtbZod+Ish+m2KzcUZryQkRYXCe+JEID3ibx74ZkWbGJ63JUw -px59x7XAalTayA8EUCc+1fyNS1bA/0K0Nob7ZXfy+wAPIl5X0TQ5FSh6rvPTnVL/ -Yk8SHQPTrxr/i9Buaub3PyOA9p6c72mCsElppOj2gQAu+xHdolgaLJRlLsEWj+9g -Kg/mas08V3dW34+jE8Z/6wa1BP3pGBJODhOgpAN4A8dbryqMVTYFVUvRPNLnU2Ue -/BcvqaDwTA6Ir/6UveQHPDGaLd14btuRjvnggNygrmxD7uZbs8+h6I6Hgu5jBZ5U -or+44YpIO3VkO2BWPVq2rJ124DuN5l5j2jpYrUP+FKaJh4Mj9WOih+DBi3WeXEeI -54iajRX5eeLQu895qRIobak4Uht+590qxO1HFY0AwllgRJTFZUVUfEr8cN2YdzX4 -EncZ -=/56f ------END PGP PUBLIC KEY BLOCK----- diff --git a/linux/obsolete/teamcity/agent/atlassian-sdk/etc/apt/sources.list.d/atlassian-sdk.list b/linux/obsolete/teamcity/agent/atlassian-sdk/etc/apt/sources.list.d/atlassian-sdk.list deleted file mode 100644 index 5b81e45ad..000000000 --- a/linux/obsolete/teamcity/agent/atlassian-sdk/etc/apt/sources.list.d/atlassian-sdk.list +++ /dev/null @@ -1 +0,0 @@ -deb [trusted=yes signed-by=/etc/apt/keyrings/atlassian.asc] https://packages.atlassian.com/atlassian-sdk-deb stable contrib diff --git a/linux/obsolete/teamcity/agent/dotnet-sdk/Dockerfile b/linux/obsolete/teamcity/agent/dotnet-sdk/Dockerfile deleted file mode 100644 index 6e655b576..000000000 --- a/linux/obsolete/teamcity/agent/dotnet-sdk/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -FROM hub.epicm.org/epicmorg/teamcity-agent:latest -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# teamcity dotnet setup -################################################################## -# Opt out of the telemetry feature -ENV DOTNET_CLI_TELEMETRY_OPTOUT=true -# Disable first time experience -ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -# Configure Kestrel web server to bind to port 80 when present -ENV ASPNETCORE_URLS=\ -# Enable detection of running in a container -ENV DOTNET_RUNNING_IN_CONTAINER=true -# Enable correct mode for dotnet watch (only mode supported in a container) -ENV DOTNET_USE_POLLING_FILE_WATCHER=true -# Skip extraction of XML docs - generally not useful within an image/container - helps perfomance -ENV NUGET_XMLDOC_MODE=skip -#unofficial support of openssl1.1 instead of 1.0 [https://stackoverflow.com/questions/51901359] -ENV CLR_OPENSSL_VERSION_OVERRIDE=45 -# PowerShell telemetry for docker image usage -ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-10 -#Install packages - -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 -################################################################## -#RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ -# echo "deb https://download.mono-project.com/repo/debian stable-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ -# echo "deb https://download.mono-project.com/repo/debian nightly-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ -# echo "deb https://download.mono-project.com/repo/debian preview-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ -# apt-get update && \ -# apt-get install -y --allow-unauthenticated \ -# mono-complete \ -# mono-llvm-support \ -# mono-devel \ -# mono-dbg \ -# referenceassemblies-pcl \ -# ca-certificates-mono -# mono-xsp4 - -################################################################## -# Cleanup -################################################################## -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 /root/tmp/* && \ - rm -rfv /tmp/* - -RUN updatedb diff --git a/linux/obsolete/teamcity/agent/dotnet-sdk/docker-compose.yml b/linux/obsolete/teamcity/agent/dotnet-sdk/docker-compose.yml deleted file mode 100644 index 7ee0d89c2..000000000 --- a/linux/obsolete/teamcity/agent/dotnet-sdk/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - app: - image: "hub.epicm.org/epicmorg/teamcity-agent:dotnet-sdk" - build: - context: . diff --git a/linux/obsolete/teamcity/agent/node4/README.md b/linux/obsolete/teamcity/agent/node4/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/node4/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/node5/README.md b/linux/obsolete/teamcity/agent/node5/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/node5/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/node6/README.md b/linux/obsolete/teamcity/agent/node6/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/node6/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/node7/README.md b/linux/obsolete/teamcity/agent/node7/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/node7/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/node8/README.md b/linux/obsolete/teamcity/agent/node8/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/node8/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/node9/README.md b/linux/obsolete/teamcity/agent/node9/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/node9/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php7.2/Dockerfile b/linux/obsolete/teamcity/agent/php7.2/Dockerfile deleted file mode 100644 index 05b06d09f..000000000 --- a/linux/obsolete/teamcity/agent/php7.2/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.2 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=jdk-17.0.13 -ARG K_JDK_VERSION=17.0.13 -ARG K_JDK_BUILD_VERSION=11 -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 - -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# teamcity minimal agent -################################################################## -LABEL dockerImage.teamcity.version="latest" \ - dockerImage.teamcity.buildNumber="latest" - -VOLUME /data/teamcity_agent/conf - -ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties -ENV LANG=C.UTF-8 -ENV GIT_SSH_VARIANT=ssh - -COPY run-agent.sh /run-agent.sh -RUN chmod +x /run-agent.sh && \ - sync - -COPY run-services.sh /run-services.sh -RUN chmod +x /run-services.sh && \ - sync - -ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ - mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ - rm -rfv /buildAgent.zip - -RUN useradd -m buildagent && \ - chmod +x /opt/buildagent/bin/*.sh && \ - chmod +x /run-agent.sh /run-services.sh && sync - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -CMD ["/run-services.sh"] - -EXPOSE 9090 diff --git a/linux/obsolete/teamcity/agent/php7.2/README.md b/linux/obsolete/teamcity/agent/php7.2/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/php7.2/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php7.2/run-agent.sh b/linux/obsolete/teamcity/agent/php7.2/run-agent.sh deleted file mode 100755 index a9ded1d14..000000000 --- a/linux/obsolete/teamcity/agent/php7.2/run-agent.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -check() { - if [[ $? != 0 ]]; then - echo "Error! Stopping the script." - exit 1 - fi -} - -configure() { - if [[ $# -gt 0 ]]; then - echo "run agent.sh configure $@" - ${AGENT_DIST}/bin/agent.sh configure "$@"; check - fi -} - -reconfigure() { - declare -a opts - [[ -n "${SERVER_URL}" ]] && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL" - [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN" - [[ -n "${AGENT_NAME}" ]] && opts[${#opts[@]}]='--name' && opts[${#opts[@]}]="$AGENT_NAME" - [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS" - [[ -n "${OWN_PORT}" ]] && opts[${#opts[@]}]='--ownPort' && opts[${#opts[@]}]="$OWN_PORT" - if [[ 0 -ne "${#opts[@]}" ]]; then - # Using sed to strip double quotes produced by docker-compose - for i in $(seq 0 $(expr ${#opts[@]} - 1)); do - opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')" - done - configure "${opts[@]}" - echo "File buildAgent.properties was updated" - fi - for AGENT_OPT in ${AGENT_OPTS}; do - echo ${AGENT_OPT} >> ${CONFIG_DIR}/buildAgent.properties - done -} - -prepare_conf() { - echo "Will prepare agent config" ; - cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check - cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check - reconfigure - echo "File buildAgent.properties was created and updated" ; -} - -AGENT_DIST=/opt/buildagent - -CONFIG_DIR=/data/teamcity_agent/conf - -LOG_DIR=/opt/buildagent/logs - - -rm -f ${LOG_DIR}/*.pid - -if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then - echo "File buildAgent.properties was found in ${CONFIG_DIR}" ; - reconfigure -else - echo "Will create new buildAgent.properties using distributive" ; - if [[ -n "${SERVER_URL}" ]]; then - echo "TeamCity URL is provided: ${SERVER_URL}" - else - echo "TeamCity URL is not provided, but is required." - exit 1 - fi - prepare_conf -fi - -if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then - ${AGENT_DIST}/bin/agent.sh start -else - echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user" - chown -R buildagent:buildagent ${AGENT_DIST} - check; sync - - echo "Start build agent under buildagent user" - sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start -fi - - - -while [ ! -f ${LOG_DIR}/teamcity-agent.log ]; -do - echo -n "." - sleep 1 -done - -trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP - -tail -qF ${LOG_DIR}/teamcity-agent.log & -wait diff --git a/linux/obsolete/teamcity/agent/php7.2/run-services.sh b/linux/obsolete/teamcity/agent/php7.2/run-services.sh deleted file mode 100755 index a574dd68a..000000000 --- a/linux/obsolete/teamcity/agent/php7.2/run-services.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo '/run-services.sh' - -for entry in /services/*.sh -do - if [[ -f "$entry" ]]; then - echo "$entry" - [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync) - "$entry" - fi -done - -echo '/run-agent.sh' -exec '/run-agent.sh' diff --git a/linux/obsolete/teamcity/agent/php7.2/sources.sid.list b/linux/obsolete/teamcity/agent/php7.2/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/obsolete/teamcity/agent/php7.2/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/obsolete/teamcity/agent/php7.3/Dockerfile b/linux/obsolete/teamcity/agent/php7.3/Dockerfile deleted file mode 100644 index 612aad9bf..000000000 --- a/linux/obsolete/teamcity/agent/php7.3/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.3 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=jdk-17.0.13 -ARG K_JDK_VERSION=17.0.13 -ARG K_JDK_BUILD_VERSION=11 -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 - -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# teamcity minimal agent -################################################################## -LABEL dockerImage.teamcity.version="latest" \ - dockerImage.teamcity.buildNumber="latest" - -VOLUME /data/teamcity_agent/conf - -ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties -ENV LANG=C.UTF-8 -ENV GIT_SSH_VARIANT=ssh - -COPY run-agent.sh /run-agent.sh -RUN chmod +x /run-agent.sh && \ - sync - -COPY run-services.sh /run-services.sh -RUN chmod +x /run-services.sh && \ - sync - -ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ - mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ - rm -rfv /buildAgent.zip - -RUN useradd -m buildagent && \ - chmod +x /opt/buildagent/bin/*.sh && \ - chmod +x /run-agent.sh /run-services.sh && sync - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -CMD ["/run-services.sh"] - -EXPOSE 9090 diff --git a/linux/obsolete/teamcity/agent/php7.3/Makefile b/linux/obsolete/teamcity/agent/php7.3/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/obsolete/teamcity/agent/php7.3/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -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 - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/php7.3/README.md b/linux/obsolete/teamcity/agent/php7.3/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/php7.3/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php7.3/run-agent.sh b/linux/obsolete/teamcity/agent/php7.3/run-agent.sh deleted file mode 100755 index a9ded1d14..000000000 --- a/linux/obsolete/teamcity/agent/php7.3/run-agent.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -check() { - if [[ $? != 0 ]]; then - echo "Error! Stopping the script." - exit 1 - fi -} - -configure() { - if [[ $# -gt 0 ]]; then - echo "run agent.sh configure $@" - ${AGENT_DIST}/bin/agent.sh configure "$@"; check - fi -} - -reconfigure() { - declare -a opts - [[ -n "${SERVER_URL}" ]] && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL" - [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN" - [[ -n "${AGENT_NAME}" ]] && opts[${#opts[@]}]='--name' && opts[${#opts[@]}]="$AGENT_NAME" - [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS" - [[ -n "${OWN_PORT}" ]] && opts[${#opts[@]}]='--ownPort' && opts[${#opts[@]}]="$OWN_PORT" - if [[ 0 -ne "${#opts[@]}" ]]; then - # Using sed to strip double quotes produced by docker-compose - for i in $(seq 0 $(expr ${#opts[@]} - 1)); do - opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')" - done - configure "${opts[@]}" - echo "File buildAgent.properties was updated" - fi - for AGENT_OPT in ${AGENT_OPTS}; do - echo ${AGENT_OPT} >> ${CONFIG_DIR}/buildAgent.properties - done -} - -prepare_conf() { - echo "Will prepare agent config" ; - cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check - cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check - reconfigure - echo "File buildAgent.properties was created and updated" ; -} - -AGENT_DIST=/opt/buildagent - -CONFIG_DIR=/data/teamcity_agent/conf - -LOG_DIR=/opt/buildagent/logs - - -rm -f ${LOG_DIR}/*.pid - -if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then - echo "File buildAgent.properties was found in ${CONFIG_DIR}" ; - reconfigure -else - echo "Will create new buildAgent.properties using distributive" ; - if [[ -n "${SERVER_URL}" ]]; then - echo "TeamCity URL is provided: ${SERVER_URL}" - else - echo "TeamCity URL is not provided, but is required." - exit 1 - fi - prepare_conf -fi - -if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then - ${AGENT_DIST}/bin/agent.sh start -else - echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user" - chown -R buildagent:buildagent ${AGENT_DIST} - check; sync - - echo "Start build agent under buildagent user" - sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start -fi - - - -while [ ! -f ${LOG_DIR}/teamcity-agent.log ]; -do - echo -n "." - sleep 1 -done - -trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP - -tail -qF ${LOG_DIR}/teamcity-agent.log & -wait diff --git a/linux/obsolete/teamcity/agent/php7.3/run-services.sh b/linux/obsolete/teamcity/agent/php7.3/run-services.sh deleted file mode 100755 index a574dd68a..000000000 --- a/linux/obsolete/teamcity/agent/php7.3/run-services.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo '/run-services.sh' - -for entry in /services/*.sh -do - if [[ -f "$entry" ]]; then - echo "$entry" - [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync) - "$entry" - fi -done - -echo '/run-agent.sh' -exec '/run-agent.sh' diff --git a/linux/obsolete/teamcity/agent/php7.3/sources.sid.list b/linux/obsolete/teamcity/agent/php7.3/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/obsolete/teamcity/agent/php7.3/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/obsolete/teamcity/agent/php7.4/Dockerfile b/linux/obsolete/teamcity/agent/php7.4/Dockerfile deleted file mode 100644 index 2036d517a..000000000 --- a/linux/obsolete/teamcity/agent/php7.4/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php7.4 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=jdk-17.0.13 -ARG K_JDK_VERSION=17.0.13 -ARG K_JDK_BUILD_VERSION=11 -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 - -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# teamcity minimal agent -################################################################## -LABEL dockerImage.teamcity.version="latest" \ - dockerImage.teamcity.buildNumber="latest" - -VOLUME /data/teamcity_agent/conf - -ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties -ENV LANG=C.UTF-8 -ENV GIT_SSH_VARIANT=ssh - -COPY run-agent.sh /run-agent.sh -RUN chmod +x /run-agent.sh && \ - sync - -COPY run-services.sh /run-services.sh -RUN chmod +x /run-services.sh && \ - sync - -ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ - mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ - rm -rfv /buildAgent.zip - -RUN useradd -m buildagent && \ - chmod +x /opt/buildagent/bin/*.sh && \ - chmod +x /run-agent.sh /run-services.sh && sync - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -CMD ["/run-services.sh"] - -EXPOSE 9090 diff --git a/linux/obsolete/teamcity/agent/php7.4/Makefile b/linux/obsolete/teamcity/agent/php7.4/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/obsolete/teamcity/agent/php7.4/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -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 - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/php7.4/README.md b/linux/obsolete/teamcity/agent/php7.4/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/php7.4/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php7.4/run-agent.sh b/linux/obsolete/teamcity/agent/php7.4/run-agent.sh deleted file mode 100755 index a9ded1d14..000000000 --- a/linux/obsolete/teamcity/agent/php7.4/run-agent.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -check() { - if [[ $? != 0 ]]; then - echo "Error! Stopping the script." - exit 1 - fi -} - -configure() { - if [[ $# -gt 0 ]]; then - echo "run agent.sh configure $@" - ${AGENT_DIST}/bin/agent.sh configure "$@"; check - fi -} - -reconfigure() { - declare -a opts - [[ -n "${SERVER_URL}" ]] && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL" - [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN" - [[ -n "${AGENT_NAME}" ]] && opts[${#opts[@]}]='--name' && opts[${#opts[@]}]="$AGENT_NAME" - [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS" - [[ -n "${OWN_PORT}" ]] && opts[${#opts[@]}]='--ownPort' && opts[${#opts[@]}]="$OWN_PORT" - if [[ 0 -ne "${#opts[@]}" ]]; then - # Using sed to strip double quotes produced by docker-compose - for i in $(seq 0 $(expr ${#opts[@]} - 1)); do - opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')" - done - configure "${opts[@]}" - echo "File buildAgent.properties was updated" - fi - for AGENT_OPT in ${AGENT_OPTS}; do - echo ${AGENT_OPT} >> ${CONFIG_DIR}/buildAgent.properties - done -} - -prepare_conf() { - echo "Will prepare agent config" ; - cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check - cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check - reconfigure - echo "File buildAgent.properties was created and updated" ; -} - -AGENT_DIST=/opt/buildagent - -CONFIG_DIR=/data/teamcity_agent/conf - -LOG_DIR=/opt/buildagent/logs - - -rm -f ${LOG_DIR}/*.pid - -if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then - echo "File buildAgent.properties was found in ${CONFIG_DIR}" ; - reconfigure -else - echo "Will create new buildAgent.properties using distributive" ; - if [[ -n "${SERVER_URL}" ]]; then - echo "TeamCity URL is provided: ${SERVER_URL}" - else - echo "TeamCity URL is not provided, but is required." - exit 1 - fi - prepare_conf -fi - -if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then - ${AGENT_DIST}/bin/agent.sh start -else - echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user" - chown -R buildagent:buildagent ${AGENT_DIST} - check; sync - - echo "Start build agent under buildagent user" - sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start -fi - - - -while [ ! -f ${LOG_DIR}/teamcity-agent.log ]; -do - echo -n "." - sleep 1 -done - -trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP - -tail -qF ${LOG_DIR}/teamcity-agent.log & -wait diff --git a/linux/obsolete/teamcity/agent/php7.4/run-services.sh b/linux/obsolete/teamcity/agent/php7.4/run-services.sh deleted file mode 100755 index a574dd68a..000000000 --- a/linux/obsolete/teamcity/agent/php7.4/run-services.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo '/run-services.sh' - -for entry in /services/*.sh -do - if [[ -f "$entry" ]]; then - echo "$entry" - [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync) - "$entry" - fi -done - -echo '/run-agent.sh' -exec '/run-agent.sh' diff --git a/linux/obsolete/teamcity/agent/php7.4/sources.sid.list b/linux/obsolete/teamcity/agent/php7.4/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/obsolete/teamcity/agent/php7.4/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/obsolete/teamcity/agent/php8.0/Dockerfile b/linux/obsolete/teamcity/agent/php8.0/Dockerfile deleted file mode 100644 index 71b161bf3..000000000 --- a/linux/obsolete/teamcity/agent/php8.0/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.0 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=jdk-17.0.13 -ARG K_JDK_VERSION=17.0.13 -ARG K_JDK_BUILD_VERSION=11 -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 - -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# teamcity minimal agent -################################################################## -LABEL dockerImage.teamcity.version="latest" \ - dockerImage.teamcity.buildNumber="latest" - -VOLUME /data/teamcity_agent/conf - -ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties -ENV LANG=C.UTF-8 -ENV GIT_SSH_VARIANT=ssh - -COPY run-agent.sh /run-agent.sh -RUN chmod +x /run-agent.sh && \ - sync - -COPY run-services.sh /run-services.sh -RUN chmod +x /run-services.sh && \ - sync - -ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ - mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ - rm -rfv /buildAgent.zip - -RUN useradd -m buildagent && \ - chmod +x /opt/buildagent/bin/*.sh && \ - chmod +x /run-agent.sh /run-services.sh && sync - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -CMD ["/run-services.sh"] - -EXPOSE 9090 diff --git a/linux/obsolete/teamcity/agent/php8.0/Makefile b/linux/obsolete/teamcity/agent/php8.0/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/obsolete/teamcity/agent/php8.0/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -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 - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/php8.0/README.md b/linux/obsolete/teamcity/agent/php8.0/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/php8.0/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php8.0/run-agent.sh b/linux/obsolete/teamcity/agent/php8.0/run-agent.sh deleted file mode 100755 index a9ded1d14..000000000 --- a/linux/obsolete/teamcity/agent/php8.0/run-agent.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -check() { - if [[ $? != 0 ]]; then - echo "Error! Stopping the script." - exit 1 - fi -} - -configure() { - if [[ $# -gt 0 ]]; then - echo "run agent.sh configure $@" - ${AGENT_DIST}/bin/agent.sh configure "$@"; check - fi -} - -reconfigure() { - declare -a opts - [[ -n "${SERVER_URL}" ]] && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL" - [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN" - [[ -n "${AGENT_NAME}" ]] && opts[${#opts[@]}]='--name' && opts[${#opts[@]}]="$AGENT_NAME" - [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS" - [[ -n "${OWN_PORT}" ]] && opts[${#opts[@]}]='--ownPort' && opts[${#opts[@]}]="$OWN_PORT" - if [[ 0 -ne "${#opts[@]}" ]]; then - # Using sed to strip double quotes produced by docker-compose - for i in $(seq 0 $(expr ${#opts[@]} - 1)); do - opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')" - done - configure "${opts[@]}" - echo "File buildAgent.properties was updated" - fi - for AGENT_OPT in ${AGENT_OPTS}; do - echo ${AGENT_OPT} >> ${CONFIG_DIR}/buildAgent.properties - done -} - -prepare_conf() { - echo "Will prepare agent config" ; - cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check - cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check - reconfigure - echo "File buildAgent.properties was created and updated" ; -} - -AGENT_DIST=/opt/buildagent - -CONFIG_DIR=/data/teamcity_agent/conf - -LOG_DIR=/opt/buildagent/logs - - -rm -f ${LOG_DIR}/*.pid - -if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then - echo "File buildAgent.properties was found in ${CONFIG_DIR}" ; - reconfigure -else - echo "Will create new buildAgent.properties using distributive" ; - if [[ -n "${SERVER_URL}" ]]; then - echo "TeamCity URL is provided: ${SERVER_URL}" - else - echo "TeamCity URL is not provided, but is required." - exit 1 - fi - prepare_conf -fi - -if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then - ${AGENT_DIST}/bin/agent.sh start -else - echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user" - chown -R buildagent:buildagent ${AGENT_DIST} - check; sync - - echo "Start build agent under buildagent user" - sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start -fi - - - -while [ ! -f ${LOG_DIR}/teamcity-agent.log ]; -do - echo -n "." - sleep 1 -done - -trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP - -tail -qF ${LOG_DIR}/teamcity-agent.log & -wait diff --git a/linux/obsolete/teamcity/agent/php8.0/run-services.sh b/linux/obsolete/teamcity/agent/php8.0/run-services.sh deleted file mode 100755 index a574dd68a..000000000 --- a/linux/obsolete/teamcity/agent/php8.0/run-services.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo '/run-services.sh' - -for entry in /services/*.sh -do - if [[ -f "$entry" ]]; then - echo "$entry" - [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync) - "$entry" - fi -done - -echo '/run-agent.sh' -exec '/run-agent.sh' diff --git a/linux/obsolete/teamcity/agent/php8.0/sources.sid.list b/linux/obsolete/teamcity/agent/php8.0/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/obsolete/teamcity/agent/php8.0/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/obsolete/teamcity/agent/php8.1/Dockerfile b/linux/obsolete/teamcity/agent/php8.1/Dockerfile deleted file mode 100644 index 63919e1bb..000000000 --- a/linux/obsolete/teamcity/agent/php8.1/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.1 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=jdk-17.0.13 -ARG K_JDK_VERSION=17.0.13 -ARG K_JDK_BUILD_VERSION=11 -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 - -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# teamcity minimal agent -################################################################## -LABEL dockerImage.teamcity.version="latest" \ - dockerImage.teamcity.buildNumber="latest" - -VOLUME /data/teamcity_agent/conf - -ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties -ENV LANG=C.UTF-8 -ENV GIT_SSH_VARIANT=ssh - -COPY run-agent.sh /run-agent.sh -RUN chmod +x /run-agent.sh && \ - sync - -COPY run-services.sh /run-services.sh -RUN chmod +x /run-services.sh && \ - sync - -ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ - mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ - rm -rfv /buildAgent.zip - -RUN useradd -m buildagent && \ - chmod +x /opt/buildagent/bin/*.sh && \ - chmod +x /run-agent.sh /run-services.sh && sync - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -CMD ["/run-services.sh"] - -EXPOSE 9090 diff --git a/linux/obsolete/teamcity/agent/php8.1/Makefile b/linux/obsolete/teamcity/agent/php8.1/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/obsolete/teamcity/agent/php8.1/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -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 - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/php8.1/README.md b/linux/obsolete/teamcity/agent/php8.1/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/php8.1/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php8.1/run-agent.sh b/linux/obsolete/teamcity/agent/php8.1/run-agent.sh deleted file mode 100755 index a9ded1d14..000000000 --- a/linux/obsolete/teamcity/agent/php8.1/run-agent.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -check() { - if [[ $? != 0 ]]; then - echo "Error! Stopping the script." - exit 1 - fi -} - -configure() { - if [[ $# -gt 0 ]]; then - echo "run agent.sh configure $@" - ${AGENT_DIST}/bin/agent.sh configure "$@"; check - fi -} - -reconfigure() { - declare -a opts - [[ -n "${SERVER_URL}" ]] && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL" - [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN" - [[ -n "${AGENT_NAME}" ]] && opts[${#opts[@]}]='--name' && opts[${#opts[@]}]="$AGENT_NAME" - [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS" - [[ -n "${OWN_PORT}" ]] && opts[${#opts[@]}]='--ownPort' && opts[${#opts[@]}]="$OWN_PORT" - if [[ 0 -ne "${#opts[@]}" ]]; then - # Using sed to strip double quotes produced by docker-compose - for i in $(seq 0 $(expr ${#opts[@]} - 1)); do - opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')" - done - configure "${opts[@]}" - echo "File buildAgent.properties was updated" - fi - for AGENT_OPT in ${AGENT_OPTS}; do - echo ${AGENT_OPT} >> ${CONFIG_DIR}/buildAgent.properties - done -} - -prepare_conf() { - echo "Will prepare agent config" ; - cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check - cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check - reconfigure - echo "File buildAgent.properties was created and updated" ; -} - -AGENT_DIST=/opt/buildagent - -CONFIG_DIR=/data/teamcity_agent/conf - -LOG_DIR=/opt/buildagent/logs - - -rm -f ${LOG_DIR}/*.pid - -if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then - echo "File buildAgent.properties was found in ${CONFIG_DIR}" ; - reconfigure -else - echo "Will create new buildAgent.properties using distributive" ; - if [[ -n "${SERVER_URL}" ]]; then - echo "TeamCity URL is provided: ${SERVER_URL}" - else - echo "TeamCity URL is not provided, but is required." - exit 1 - fi - prepare_conf -fi - -if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then - ${AGENT_DIST}/bin/agent.sh start -else - echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user" - chown -R buildagent:buildagent ${AGENT_DIST} - check; sync - - echo "Start build agent under buildagent user" - sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start -fi - - - -while [ ! -f ${LOG_DIR}/teamcity-agent.log ]; -do - echo -n "." - sleep 1 -done - -trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP - -tail -qF ${LOG_DIR}/teamcity-agent.log & -wait diff --git a/linux/obsolete/teamcity/agent/php8.1/run-services.sh b/linux/obsolete/teamcity/agent/php8.1/run-services.sh deleted file mode 100755 index a574dd68a..000000000 --- a/linux/obsolete/teamcity/agent/php8.1/run-services.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo '/run-services.sh' - -for entry in /services/*.sh -do - if [[ -f "$entry" ]]; then - echo "$entry" - [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync) - "$entry" - fi -done - -echo '/run-agent.sh' -exec '/run-agent.sh' diff --git a/linux/obsolete/teamcity/agent/php8.1/sources.sid.list b/linux/obsolete/teamcity/agent/php8.1/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/obsolete/teamcity/agent/php8.1/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/obsolete/teamcity/agent/php8.2/Dockerfile b/linux/obsolete/teamcity/agent/php8.2/Dockerfile deleted file mode 100644 index 4df1f3166..000000000 --- a/linux/obsolete/teamcity/agent/php8.2/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.2 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=jdk-17.0.13 -ARG K_JDK_VERSION=17.0.13 -ARG K_JDK_BUILD_VERSION=11 -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 - -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# teamcity minimal agent -################################################################## -LABEL dockerImage.teamcity.version="latest" \ - dockerImage.teamcity.buildNumber="latest" - -VOLUME /data/teamcity_agent/conf - -ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties -ENV LANG=C.UTF-8 -ENV GIT_SSH_VARIANT=ssh - -COPY run-agent.sh /run-agent.sh -RUN chmod +x /run-agent.sh && \ - sync - -COPY run-services.sh /run-services.sh -RUN chmod +x /run-services.sh && \ - sync - -ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ - mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ - rm -rfv /buildAgent.zip - -RUN useradd -m buildagent && \ - chmod +x /opt/buildagent/bin/*.sh && \ - chmod +x /run-agent.sh /run-services.sh && sync - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -CMD ["/run-services.sh"] - -EXPOSE 9090 diff --git a/linux/obsolete/teamcity/agent/php8.2/Makefile b/linux/obsolete/teamcity/agent/php8.2/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/obsolete/teamcity/agent/php8.2/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -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 - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/php8.2/README.md b/linux/obsolete/teamcity/agent/php8.2/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/php8.2/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php8.2/run-agent.sh b/linux/obsolete/teamcity/agent/php8.2/run-agent.sh deleted file mode 100755 index a9ded1d14..000000000 --- a/linux/obsolete/teamcity/agent/php8.2/run-agent.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -check() { - if [[ $? != 0 ]]; then - echo "Error! Stopping the script." - exit 1 - fi -} - -configure() { - if [[ $# -gt 0 ]]; then - echo "run agent.sh configure $@" - ${AGENT_DIST}/bin/agent.sh configure "$@"; check - fi -} - -reconfigure() { - declare -a opts - [[ -n "${SERVER_URL}" ]] && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL" - [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN" - [[ -n "${AGENT_NAME}" ]] && opts[${#opts[@]}]='--name' && opts[${#opts[@]}]="$AGENT_NAME" - [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS" - [[ -n "${OWN_PORT}" ]] && opts[${#opts[@]}]='--ownPort' && opts[${#opts[@]}]="$OWN_PORT" - if [[ 0 -ne "${#opts[@]}" ]]; then - # Using sed to strip double quotes produced by docker-compose - for i in $(seq 0 $(expr ${#opts[@]} - 1)); do - opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')" - done - configure "${opts[@]}" - echo "File buildAgent.properties was updated" - fi - for AGENT_OPT in ${AGENT_OPTS}; do - echo ${AGENT_OPT} >> ${CONFIG_DIR}/buildAgent.properties - done -} - -prepare_conf() { - echo "Will prepare agent config" ; - cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check - cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check - reconfigure - echo "File buildAgent.properties was created and updated" ; -} - -AGENT_DIST=/opt/buildagent - -CONFIG_DIR=/data/teamcity_agent/conf - -LOG_DIR=/opt/buildagent/logs - - -rm -f ${LOG_DIR}/*.pid - -if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then - echo "File buildAgent.properties was found in ${CONFIG_DIR}" ; - reconfigure -else - echo "Will create new buildAgent.properties using distributive" ; - if [[ -n "${SERVER_URL}" ]]; then - echo "TeamCity URL is provided: ${SERVER_URL}" - else - echo "TeamCity URL is not provided, but is required." - exit 1 - fi - prepare_conf -fi - -if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then - ${AGENT_DIST}/bin/agent.sh start -else - echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user" - chown -R buildagent:buildagent ${AGENT_DIST} - check; sync - - echo "Start build agent under buildagent user" - sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start -fi - - - -while [ ! -f ${LOG_DIR}/teamcity-agent.log ]; -do - echo -n "." - sleep 1 -done - -trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP - -tail -qF ${LOG_DIR}/teamcity-agent.log & -wait diff --git a/linux/obsolete/teamcity/agent/php8.2/run-services.sh b/linux/obsolete/teamcity/agent/php8.2/run-services.sh deleted file mode 100755 index a574dd68a..000000000 --- a/linux/obsolete/teamcity/agent/php8.2/run-services.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo '/run-services.sh' - -for entry in /services/*.sh -do - if [[ -f "$entry" ]]; then - echo "$entry" - [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync) - "$entry" - fi -done - -echo '/run-agent.sh' -exec '/run-agent.sh' diff --git a/linux/obsolete/teamcity/agent/php8.2/sources.sid.list b/linux/obsolete/teamcity/agent/php8.2/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/obsolete/teamcity/agent/php8.2/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/obsolete/teamcity/agent/php8.3/Dockerfile b/linux/obsolete/teamcity/agent/php8.3/Dockerfile deleted file mode 100644 index 444288733..000000000 --- a/linux/obsolete/teamcity/agent/php8.3/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM hub.epicm.org/epicmorg/debian:bookworm-php8.3 -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=jdk-17.0.13 -ARG K_JDK_VERSION=17.0.13 -ARG K_JDK_BUILD_VERSION=11 -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 - -ENV JAVA_HOME=/usr/local/${K_JDK_MAJOR_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# teamcity minimal agent -################################################################## -LABEL dockerImage.teamcity.version="latest" \ - dockerImage.teamcity.buildNumber="latest" - -VOLUME /data/teamcity_agent/conf - -ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties -ENV LANG=C.UTF-8 -ENV GIT_SSH_VARIANT=ssh - -COPY run-agent.sh /run-agent.sh -RUN chmod +x /run-agent.sh && \ - sync - -COPY run-services.sh /run-services.sh -RUN chmod +x /run-services.sh && \ - sync - -ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ - mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ - rm -rfv /buildAgent.zip - -RUN useradd -m buildagent && \ - chmod +x /opt/buildagent/bin/*.sh && \ - chmod +x /run-agent.sh /run-services.sh && sync - -################################################################## -# php -################################################################## -RUN php -m && \ - php -v - - -################################################################## -# 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 /root/tmp/* && \ - rm -rfv /tmp/* - -CMD ["/run-services.sh"] - -EXPOSE 9090 diff --git a/linux/obsolete/teamcity/agent/php8.3/Makefile b/linux/obsolete/teamcity/agent/php8.3/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/obsolete/teamcity/agent/php8.3/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -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 - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/obsolete/teamcity/agent/php8.3/README.md b/linux/obsolete/teamcity/agent/php8.3/README.md deleted file mode 100644 index b53fe01e8..000000000 --- a/linux/obsolete/teamcity/agent/php8.3/README.md +++ /dev/null @@ -1,93 +0,0 @@ -## TeamCity Minimal Build Agent - -[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) - -This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image. - - More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md). - -The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes. -You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server. - -This minimal image adds just a TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/). - -## How to Use This Image - -Pull the TeamCity minimal image from the Docker Hub Repository: - -``` -jetbrains/teamcity-minimal-agent -``` -  -and use the following command to start a container with TeamCity agent running inside -a Linux container: - -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - jetbrains/teamcity-minimal-agent -``` -  -or a Windows container: -``` -docker run -it -e SERVER_URL="" - -v :C:/BuildAgent/conf - jetbrains/teamcity-minimal-agent -``` -where `` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container. -`` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create. - -Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases. - -When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html). - -All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved. - -TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server. - -### Agent Image Environment Variables - -- **SERVER_URL** - URL of the TeamCity server agent will connect to -- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted -- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI. -- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected -- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default - -### Windows Containers Limitations - -The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers). - -## Customization - -You can customize the image via the usual Docker procedure: - -1. Run the image -``` -docker run -it -e SERVER_URL="" \ - -v :/data/teamcity_agent/conf \ - --name="my-customized-agent" \ - jetbrains/teamcity-minimal-agent \ -``` -2. Enter the container -``` -docker exec -it my-customized-agent bash -``` - -3. Change whatever you need -4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container -``` -docker commit my-customized-agent -``` - -## License - -The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html). -TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html). - -## Feedback - -Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW). - -## Other TeamCity Images -* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/) -* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/) diff --git a/linux/obsolete/teamcity/agent/php8.3/run-agent.sh b/linux/obsolete/teamcity/agent/php8.3/run-agent.sh deleted file mode 100755 index a9ded1d14..000000000 --- a/linux/obsolete/teamcity/agent/php8.3/run-agent.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -check() { - if [[ $? != 0 ]]; then - echo "Error! Stopping the script." - exit 1 - fi -} - -configure() { - if [[ $# -gt 0 ]]; then - echo "run agent.sh configure $@" - ${AGENT_DIST}/bin/agent.sh configure "$@"; check - fi -} - -reconfigure() { - declare -a opts - [[ -n "${SERVER_URL}" ]] && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL" - [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN" - [[ -n "${AGENT_NAME}" ]] && opts[${#opts[@]}]='--name' && opts[${#opts[@]}]="$AGENT_NAME" - [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS" - [[ -n "${OWN_PORT}" ]] && opts[${#opts[@]}]='--ownPort' && opts[${#opts[@]}]="$OWN_PORT" - if [[ 0 -ne "${#opts[@]}" ]]; then - # Using sed to strip double quotes produced by docker-compose - for i in $(seq 0 $(expr ${#opts[@]} - 1)); do - opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')" - done - configure "${opts[@]}" - echo "File buildAgent.properties was updated" - fi - for AGENT_OPT in ${AGENT_OPTS}; do - echo ${AGENT_OPT} >> ${CONFIG_DIR}/buildAgent.properties - done -} - -prepare_conf() { - echo "Will prepare agent config" ; - cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check - cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check - reconfigure - echo "File buildAgent.properties was created and updated" ; -} - -AGENT_DIST=/opt/buildagent - -CONFIG_DIR=/data/teamcity_agent/conf - -LOG_DIR=/opt/buildagent/logs - - -rm -f ${LOG_DIR}/*.pid - -if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then - echo "File buildAgent.properties was found in ${CONFIG_DIR}" ; - reconfigure -else - echo "Will create new buildAgent.properties using distributive" ; - if [[ -n "${SERVER_URL}" ]]; then - echo "TeamCity URL is provided: ${SERVER_URL}" - else - echo "TeamCity URL is not provided, but is required." - exit 1 - fi - prepare_conf -fi - -if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then - ${AGENT_DIST}/bin/agent.sh start -else - echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user" - chown -R buildagent:buildagent ${AGENT_DIST} - check; sync - - echo "Start build agent under buildagent user" - sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start -fi - - - -while [ ! -f ${LOG_DIR}/teamcity-agent.log ]; -do - echo -n "." - sleep 1 -done - -trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP - -tail -qF ${LOG_DIR}/teamcity-agent.log & -wait diff --git a/linux/obsolete/teamcity/agent/php8.3/run-services.sh b/linux/obsolete/teamcity/agent/php8.3/run-services.sh deleted file mode 100755 index a574dd68a..000000000 --- a/linux/obsolete/teamcity/agent/php8.3/run-services.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo '/run-services.sh' - -for entry in /services/*.sh -do - if [[ -f "$entry" ]]; then - echo "$entry" - [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync) - "$entry" - fi -done - -echo '/run-agent.sh' -exec '/run-agent.sh' diff --git a/linux/obsolete/teamcity/agent/php8.3/sources.sid.list b/linux/obsolete/teamcity/agent/php8.3/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/obsolete/teamcity/agent/php8.3/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free