From 0782f5f572d02f5b2587e7fd524fd6b32d694170 Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Tue, 15 Nov 2022 23:56:32 +0300 Subject: [PATCH] make - autocommit --- .../workflows/epicmorg.advanced.images.yml | 4 +- .../epicmorg.base.images.giltab.runners.yml | 2 +- .../workflows/epicmorg.base.images.nodejs.yml | 4 +- CHANGELOG.md | 1 + linux/advanced/vscode-server/amxx/Dockerfile | 22 ++--- .../vscode-server/dotnet-full/Dockerfile | 56 +++++------ .../advanced/vscode-server/dotnet/Dockerfile | 57 ++++++------ .../debian/06-squeeze/main/Dockerfile | 16 ---- .../gitlab/runner/amxx-sdk/1.10/Dockerfile | 41 ++++++++ .../runner/amxx-sdk/{ => 1.10}/Makefile | 0 .../runner/amxx-sdk/{ => 1.10}/README.md | 0 .../runner/amxx-sdk/1.10/docker-compose.yml | 6 ++ .../runner/amxx-sdk/{ => 1.9}/Dockerfile | 3 +- .../runner/amxx-sdk/1.9}/Makefile | 0 .../gitlab/runner/amxx-sdk/1.9/README.md | 0 .../amxx-sdk/{ => 1.9}/docker-compose.yml | 0 linux/ecosystem/nodejs/node10/Dockerfile | 3 +- linux/ecosystem/nodejs/node19/Dockerfile | 35 +++++++ linux/ecosystem/nodejs/node19/Makefile | 19 ++++ .../amxx-sdk => nodejs/node19}/README.md | 0 .../nodejs/node19/docker-compose.yml | 6 ++ .../teamcity/agent/amxx-sdk/1.10/Dockerfile | 41 ++++++++ .../teamcity/agent/amxx-sdk/1.10/Makefile | 19 ++++ .../teamcity/agent/amxx-sdk/1.10/README.md | 93 +++++++++++++++++++ .../agent/amxx-sdk/1.10/docker-compose.yml | 6 ++ .../agent/amxx-sdk/{ => 1.9}/Dockerfile | 4 +- .../teamcity/agent/amxx-sdk/1.9/Makefile | 19 ++++ .../teamcity/agent/amxx-sdk/1.9/README.md | 93 +++++++++++++++++++ .../amxx-sdk/{ => 1.9}/docker-compose.yml | 0 29 files changed, 458 insertions(+), 92 deletions(-) create mode 100644 linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile rename linux/ecosystem/gitlab/runner/amxx-sdk/{ => 1.10}/Makefile (100%) rename linux/ecosystem/gitlab/runner/amxx-sdk/{ => 1.10}/README.md (100%) create mode 100644 linux/ecosystem/gitlab/runner/amxx-sdk/1.10/docker-compose.yml rename linux/ecosystem/gitlab/runner/amxx-sdk/{ => 1.9}/Dockerfile (96%) rename linux/ecosystem/{teamcity/agent/amxx-sdk => gitlab/runner/amxx-sdk/1.9}/Makefile (100%) create mode 100644 linux/ecosystem/gitlab/runner/amxx-sdk/1.9/README.md rename linux/ecosystem/gitlab/runner/amxx-sdk/{ => 1.9}/docker-compose.yml (100%) create mode 100644 linux/ecosystem/nodejs/node19/Dockerfile create mode 100644 linux/ecosystem/nodejs/node19/Makefile rename linux/ecosystem/{teamcity/agent/amxx-sdk => nodejs/node19}/README.md (100%) create mode 100644 linux/ecosystem/nodejs/node19/docker-compose.yml create mode 100644 linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Dockerfile create mode 100644 linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Makefile create mode 100644 linux/ecosystem/teamcity/agent/amxx-sdk/1.10/README.md create mode 100644 linux/ecosystem/teamcity/agent/amxx-sdk/1.10/docker-compose.yml rename linux/ecosystem/teamcity/agent/amxx-sdk/{ => 1.9}/Dockerfile (96%) create mode 100644 linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Makefile create mode 100644 linux/ecosystem/teamcity/agent/amxx-sdk/1.9/README.md rename linux/ecosystem/teamcity/agent/amxx-sdk/{ => 1.9}/docker-compose.yml (100%) diff --git a/.github/workflows/epicmorg.advanced.images.yml b/.github/workflows/epicmorg.advanced.images.yml index 18870aae2..5d557235e 100644 --- a/.github/workflows/epicmorg.advanced.images.yml +++ b/.github/workflows/epicmorg.advanced.images.yml @@ -29,8 +29,8 @@ jobs: - name: "Build and Deploy Advanced Teamcity Server Image:" run: cd linux/advanced/teamcity/server && pwd && make build && make deploy - - name: "Build and Deploy Advanced Redash Images:" - run: cd linux/advanced/redash && pwd && make sync && make patch && make build && make deploy +# - name: "Build and Deploy Advanced Redash Images:" +# run: cd linux/advanced/redash && pwd && make sync && make patch && make build && make deploy ################################################################################## diff --git a/.github/workflows/epicmorg.base.images.giltab.runners.yml b/.github/workflows/epicmorg.base.images.giltab.runners.yml index 565c9d996..341904933 100644 --- a/.github/workflows/epicmorg.base.images.giltab.runners.yml +++ b/.github/workflows/epicmorg.base.images.giltab.runners.yml @@ -29,7 +29,7 @@ jobs: build-glr-other-images: name: Build EpicMorg Gitlab Runner Oter Images runs-on: ubuntu-22.04 - needs: build-tca-main-images + needs: build-glr-main-images steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/epicmorg.base.images.nodejs.yml b/.github/workflows/epicmorg.base.images.nodejs.yml index eab29a8f8..735bc7134 100644 --- a/.github/workflows/epicmorg.base.images.nodejs.yml +++ b/.github/workflows/epicmorg.base.images.nodejs.yml @@ -54,8 +54,8 @@ jobs: - name: "Build and Deploy NodeJS 18 Image:" run: cd linux/ecosystem/nodejs/node18 && pwd && make build && make deploy - - name: "Build and Deploy NodeJS 18 Image:" - run: cd linux/ecosystem/nodejs/node18 && pwd && make build && make deploy + - name: "Build and Deploy NodeJS 19 Image:" + run: cd linux/ecosystem/nodejs/node19 && pwd && make build && make deploy ################################################################################## diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c2f34031..cbb086edf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * added `nginx` with `http3` and `quic` support * fixed `GitHub Actions` and `Makefile` * updated `base` images + * added `node19` * `oct` * just fixes * `sep` diff --git a/linux/advanced/vscode-server/amxx/Dockerfile b/linux/advanced/vscode-server/amxx/Dockerfile index cb4a5ba9f..d2bd8975d 100644 --- a/linux/advanced/vscode-server/amxx/Dockerfile +++ b/linux/advanced/vscode-server/amxx/Dockerfile @@ -16,21 +16,21 @@ ENV BuildDocker true ################################################################## # # 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` && \ +# 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.9 +ENV AMXX_VERSION=1.10 ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting ENV PATH=$PATH:$AMXX_BIN_PATH ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH -RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \ +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 / && \ @@ -48,8 +48,4 @@ RUN apt purge policykit-1 -y && \ rm -rfv /tmp/mc.patch && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/7z && \ - rm -rfv /tmp/deb/* && \ - rm -rfv /tmp/composer-setup.php && \ - rm -rfv /tmp/amxx_base_latest.tar.gz && \ - rm -rfv /tmp/atlassian-plugin-sdk.deb && \ - rm -rfv /tmp/addons + rm -rfv /tmp/* diff --git a/linux/advanced/vscode-server/dotnet-full/Dockerfile b/linux/advanced/vscode-server/dotnet-full/Dockerfile index 238f11763..66d5df641 100644 --- a/linux/advanced/vscode-server/dotnet-full/Dockerfile +++ b/linux/advanced/vscode-server/dotnet-full/Dockerfile @@ -36,28 +36,34 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/20.04/prod focal main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ - dotnet-sdk-2.1 \ - dotnet-runtime-deps-2.1 \ - dotnet-runtime-2.1 \ - dotnet-hostfxr-2.1 \ - dotnet-sdk-3.1 \ - dotnet-targeting-pack-3.1 \ - dotnet-runtime-deps-3.1 \ - dotnet-runtime-3.1 \ - dotnet-hostfxr-3.1 \ - dotnet-apphost-pack-3.1 \ - dotnet-sdk-5.0 \ - dotnet-targeting-pack-5.0 \ - dotnet-runtime-deps-5.0 \ - dotnet-runtime-5.0 \ - dotnet-hostfxr-5.0 \ - dotnet-apphost-pack-5.0 \ - dotnet-sdk-6.0 \ - dotnet-targeting-pack-6.0 \ - dotnet-runtime-deps-6.0 \ - dotnet-runtime-6.0 \ - dotnet-hostfxr-6.0 \ - dotnet-apphost-pack-6.0 \ +# dotnet-sdk-2.1 \ +# dotnet-runtime-deps-2.1 \ +# dotnet-runtime-2.1 \ +# dotnet-hostfxr-2.1 \ +# dotnet-sdk-3.1 \ +# dotnet-targeting-pack-3.1 \ +# dotnet-runtime-deps-3.1 \ +# dotnet-runtime-3.1 \ +# dotnet-hostfxr-3.1 \ +# dotnet-apphost-pack-3.1 \ +# dotnet-sdk-5.0 \ +# dotnet-targeting-pack-5.0 \ +# dotnet-runtime-deps-5.0 \ +# dotnet-runtime-5.0 \ +# dotnet-hostfxr-5.0 \ +# dotnet-apphost-pack-5.0 \ +# dotnet-sdk-6.0 \ +# dotnet-targeting-pack-6.0 \ +# dotnet-runtime-deps-6.0 \ +# dotnet-runtime-6.0 \ +# dotnet-hostfxr-6.0 \ +# dotnet-apphost-pack-6.0 \ + dotnet-sdk-7.0 \ + dotnet-targeting-pack-7.0 \ + dotnet-runtime-deps-7.0 \ + dotnet-runtime-7.0 \ + dotnet-hostfxr-7.0 \ + dotnet-apphost-pack-7.0 \ dotnet-host \ procdump \ procmon \ @@ -103,8 +109,4 @@ RUN apt purge policykit-1 -y && \ rm -rfv /tmp/mc.patch && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/7z && \ - rm -rfv /tmp/deb/* && \ - rm -rfv /tmp/composer-setup.php && \ - rm -rfv /tmp/amxx_base_latest.tar.gz && \ - rm -rfv /tmp/atlassian-plugin-sdk.deb && \ - rm -rfv /tmp/addons + rm -rfv /tmp/* diff --git a/linux/advanced/vscode-server/dotnet/Dockerfile b/linux/advanced/vscode-server/dotnet/Dockerfile index 085a716f6..47933a5ce 100644 --- a/linux/advanced/vscode-server/dotnet/Dockerfile +++ b/linux/advanced/vscode-server/dotnet/Dockerfile @@ -36,28 +36,34 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/20.04/prod focal main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ - dotnet-sdk-2.1 \ - dotnet-runtime-deps-2.1 \ - dotnet-runtime-2.1 \ - dotnet-hostfxr-2.1 \ - dotnet-sdk-3.1 \ - dotnet-targeting-pack-3.1 \ - dotnet-runtime-deps-3.1 \ - dotnet-runtime-3.1 \ - dotnet-hostfxr-3.1 \ - dotnet-apphost-pack-3.1 \ - dotnet-sdk-5.0 \ - dotnet-targeting-pack-5.0 \ - dotnet-runtime-deps-5.0 \ - dotnet-runtime-5.0 \ - dotnet-hostfxr-5.0 \ - dotnet-apphost-pack-5.0 \ - dotnet-sdk-6.0 \ - dotnet-targeting-pack-6.0 \ - dotnet-runtime-deps-6.0 \ - dotnet-runtime-6.0 \ - dotnet-hostfxr-6.0 \ - dotnet-apphost-pack-6.0 \ +# dotnet-sdk-2.1 \ +# dotnet-runtime-deps-2.1 \ +# dotnet-runtime-2.1 \ +# dotnet-hostfxr-2.1 \ +# dotnet-sdk-3.1 \ +# dotnet-targeting-pack-3.1 \ +# dotnet-runtime-deps-3.1 \ +# dotnet-runtime-3.1 \ +# dotnet-hostfxr-3.1 \ +# dotnet-apphost-pack-3.1 \ +# dotnet-sdk-5.0 \ +# dotnet-targeting-pack-5.0 \ +# dotnet-runtime-deps-5.0 \ +# dotnet-runtime-5.0 \ +# dotnet-hostfxr-5.0 \ +# dotnet-apphost-pack-5.0 \ +# dotnet-sdk-6.0 \ +# dotnet-targeting-pack-6.0 \ +# dotnet-runtime-deps-6.0 \ +# dotnet-runtime-6.0 \ +# dotnet-hostfxr-6.0 \ +# dotnet-apphost-pack-6.0 \ + dotnet-sdk-7.0 \ + dotnet-targeting-pack-7.0 \ + dotnet-runtime-deps-7.0 \ + dotnet-runtime-7.0 \ + dotnet-hostfxr-7.0 \ + dotnet-apphost-pack-7.0 \ dotnet-host \ procdump \ procmon \ @@ -85,9 +91,4 @@ RUN apt purge policykit-1 -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /tmp/mc.patch && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/7z && \ - rm -rfv /tmp/deb/* && \ - rm -rfv /tmp/composer-setup.php && \ - rm -rfv /tmp/amxx_base_latest.tar.gz && \ - rm -rfv /tmp/atlassian-plugin-sdk.deb && \ - rm -rfv /tmp/addons + rm -rfv /tmp/* diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile index 0ea3a2577..7bf66412d 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile @@ -117,22 +117,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue -P /usr/bin ${P4_DOWNLOAD_URL} && \ chmod +x /usr/bin/p4 -################################################################## -# dumb init -################################################################## -ENV DUMB_INIT_VERSION=1.2.5 -RUN wget -q --no-check-certificate -c https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 --random-wait -O /usr/bin/dumb-init && \ - chmod +x /usr/bin/dumb-init && \ - dumb-init --version - -################################################################## -# grab gosu for easy step-down from root -################################################################## -ENV GOSU_VER 1.14 -RUN wget -q --no-check-certificate -c https://github.com/tianon/gosu/releases/download/${GOSU_VER}/gosu-amd64 --random-wait -O /usr/local/bin/gosu && \ - chmod +x /usr/local/bin/gosu && \ - gosu --version - ################################################################## # Generate ssl key ################################################################## 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..f1e320a02 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile @@ -0,0 +1,41 @@ +FROM epicmorg/gitlab-runner:latest +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=/opt/amxmodx/$AMXX_VERSION +ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting +ENV PATH=$PATH:$AMXX_BIN_PATH +ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH + +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 && \ + amxxpc --help 2>&1 | head -n 1 + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt-get clean all && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/Makefile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Makefile similarity index 100% rename from linux/ecosystem/gitlab/runner/amxx-sdk/Makefile rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Makefile diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/README.md b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/README.md similarity index 100% rename from linux/ecosystem/gitlab/runner/amxx-sdk/README.md rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.10/README.md 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..c1fd7c4c6 --- /dev/null +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/gitlab-runner:amxx-sdk-rc" + build: + context: . diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile similarity index 96% rename from linux/ecosystem/gitlab/runner/amxx-sdk/Dockerfile rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile index 7ddedb46c..455ade5c8 100644 --- a/linux/ecosystem/gitlab/runner/amxx-sdk/Dockerfile +++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile @@ -27,7 +27,8 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1. 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 + chmod +x $AMXX_BIN_PATH/compile.sh && \ + amxxpc --help 2>&1 | head -n 1 ################################################################## # cleaninig up diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/Makefile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Makefile similarity index 100% rename from linux/ecosystem/teamcity/agent/amxx-sdk/Makefile rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Makefile diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/README.md b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/docker-compose.yml b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/docker-compose.yml similarity index 100% rename from linux/ecosystem/gitlab/runner/amxx-sdk/docker-compose.yml rename to linux/ecosystem/gitlab/runner/amxx-sdk/1.9/docker-compose.yml diff --git a/linux/ecosystem/nodejs/node10/Dockerfile b/linux/ecosystem/nodejs/node10/Dockerfile index ed6c6e3de..f7fc4897a 100644 --- a/linux/ecosystem/nodejs/node10/Dockerfile +++ b/linux/ecosystem/nodejs/node10/Dockerfile @@ -12,7 +12,8 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-cache policy nodejs && \ + apt-get install -y nodejs=10.24.1-deb-1nodesource1 yarn # curl -L https://www.npmjs.com/install.sh | sh # npm install -g npm diff --git a/linux/ecosystem/nodejs/node19/Dockerfile b/linux/ecosystem/nodejs/node19/Dockerfile new file mode 100644 index 000000000..e052517d9 --- /dev/null +++ b/linux/ecosystem/nodejs/node19/Dockerfile @@ -0,0 +1,35 @@ +FROM epicmorg/debian:bullseye +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# Node.js 19.x +################################################################## +RUN groupadd node && \ + useradd --gid node --shell /bin/bash --create-home node + +RUN curl -sL https://deb.nodesource.com/setup_19.x | bash - && \ + curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ + echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ + apt-get clean && apt-get autoclean && \ + apt-get update && \ + apt-get install -y -o 'Acquire::Retries=3' nodejs yarn + +# curl -L https://www.npmjs.com/install.sh | sh +# npm install -g npm + +RUN echo "=============================================" && \ + echo node $(node --version) && \ + echo npm $(npm --version) && \ + echo yarn $(yarn --version) && \ + echo "=============================================" + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt-get clean all && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* diff --git a/linux/ecosystem/nodejs/node19/Makefile b/linux/ecosystem/nodejs/node19/Makefile new file mode 100644 index 000000000..9ef622aa9 --- /dev/null +++ b/linux/ecosystem/nodejs/node19/Makefile @@ -0,0 +1,19 @@ +all: app + +app: + make build + make deploy + make clean + +build: + docker-compose build --compress --parallel --progress plain + +deploy: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/README.md b/linux/ecosystem/nodejs/node19/README.md similarity index 100% rename from linux/ecosystem/teamcity/agent/amxx-sdk/README.md rename to linux/ecosystem/nodejs/node19/README.md diff --git a/linux/ecosystem/nodejs/node19/docker-compose.yml b/linux/ecosystem/nodejs/node19/docker-compose.yml new file mode 100644 index 000000000..b4dd9ecbe --- /dev/null +++ b/linux/ecosystem/nodejs/node19/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/nodejs:node19" + build: + context: . diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Dockerfile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Dockerfile new file mode 100644 index 000000000..1f081ff41 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Dockerfile @@ -0,0 +1,41 @@ +FROM epicmorg/teamcity-agent:latest +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=/opt/amxmodx/$AMXX_VERSION +ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting +ENV PATH=$PATH:$AMXX_BIN_PATH +ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH + +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 && \ + amxxpc --help 2>&1 | head -n 1 + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt-get clean all && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Makefile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Makefile new file mode 100644 index 000000000..9ef622aa9 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/Makefile @@ -0,0 +1,19 @@ +all: app + +app: + make build + make deploy + make clean + +build: + docker-compose build --compress --parallel --progress plain + +deploy: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/README.md b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/README.md new file mode 100644 index 000000000..b53fe01e8 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/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/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/ecosystem/teamcity/agent/amxx-sdk/1.10/docker-compose.yml b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/docker-compose.yml new file mode 100644 index 000000000..116b46796 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.10/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/teamcity-agent:amxx-sdk-rc" + build: + context: . diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/Dockerfile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Dockerfile similarity index 96% rename from linux/ecosystem/teamcity/agent/amxx-sdk/Dockerfile rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Dockerfile index bc9e80a6b..cbe58ba56 100644 --- a/linux/ecosystem/teamcity/agent/amxx-sdk/Dockerfile +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Dockerfile @@ -27,7 +27,9 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1. 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 + chmod +x $AMXX_BIN_PATH/compile.sh && \ + amxxpc --help 2>&1 | head -n 1 + ################################################################## # cleaninig up diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Makefile b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Makefile new file mode 100644 index 000000000..9ef622aa9 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/Makefile @@ -0,0 +1,19 @@ +all: app + +app: + make build + make deploy + make clean + +build: + docker-compose build --compress --parallel --progress plain + +deploy: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/README.md b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/README.md new file mode 100644 index 000000000..b53fe01e8 --- /dev/null +++ b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/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/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/ecosystem/teamcity/agent/amxx-sdk/docker-compose.yml b/linux/ecosystem/teamcity/agent/amxx-sdk/1.9/docker-compose.yml similarity index 100% rename from linux/ecosystem/teamcity/agent/amxx-sdk/docker-compose.yml rename to linux/ecosystem/teamcity/agent/amxx-sdk/1.9/docker-compose.yml