make - autocommit

This commit is contained in:
Zimovskii Anatolii 2022-11-17 14:31:25 +03:00
parent 67a17eeaf1
commit f825a5aa37
Signed by: stam
GPG Key ID: 9911D9EF664EEE14
5 changed files with 85 additions and 99 deletions

View File

@ -14,6 +14,7 @@
* updated `base` images * updated `base` images
* added `node19`, `node4`, `node6`, `node8` * added `node19`, `node4`, `node6`, `node8`
* added `amxX 1.10` * added `amxX 1.10`
* added `dotnet7`
* `oct` * `oct`
* just fixes * just fixes
* `sep` * `sep`

View File

@ -172,28 +172,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 && \ 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 update && \
apt-get install -y --no-install-recommends --allow-unauthenticated \ apt-get install -y --no-install-recommends --allow-unauthenticated \
dotnet-sdk-2.1 \ # dotnet-sdk-2.1 \
dotnet-runtime-deps-2.1 \ # dotnet-runtime-deps-2.1 \
dotnet-runtime-2.1 \ # dotnet-runtime-2.1 \
dotnet-hostfxr-2.1 \ # dotnet-hostfxr-2.1 \
dotnet-sdk-3.1 \ # dotnet-sdk-3.1 \
dotnet-targeting-pack-3.1 \ # dotnet-targeting-pack-3.1 \
dotnet-runtime-deps-3.1 \ # dotnet-runtime-deps-3.1 \
dotnet-runtime-3.1 \ # dotnet-runtime-3.1 \
dotnet-hostfxr-3.1 \ # dotnet-hostfxr-3.1 \
dotnet-apphost-pack-3.1 \ # dotnet-apphost-pack-3.1 \
dotnet-sdk-5.0 \ # dotnet-sdk-5.0 \
dotnet-targeting-pack-5.0 \ # dotnet-targeting-pack-5.0 \
dotnet-runtime-deps-5.0 \ # dotnet-runtime-deps-5.0 \
dotnet-runtime-5.0 \ # dotnet-runtime-5.0 \
dotnet-hostfxr-5.0 \ # dotnet-hostfxr-5.0 \
dotnet-apphost-pack-5.0 \ # dotnet-apphost-pack-5.0 \
dotnet-sdk-6.0 \ # dotnet-sdk-6.0 \
dotnet-targeting-pack-6.0 \ # dotnet-targeting-pack-6.0 \
dotnet-runtime-deps-6.0 \ # dotnet-runtime-deps-6.0 \
dotnet-runtime-6.0 \ # dotnet-runtime-6.0 \
dotnet-hostfxr-6.0 \ # dotnet-hostfxr-6.0 \
dotnet-apphost-pack-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 \ dotnet-host \
procdump \ procdump \
procmon \ procmon \

View File

@ -36,28 +36,34 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
libssl1.1 \ libssl1.1 \
libstdc++6 \ libstdc++6 \
zlib1g \ zlib1g \
dotnet-sdk-2.1 \ # dotnet-sdk-2.1 \
dotnet-runtime-deps-2.1 \ # dotnet-runtime-deps-2.1 \
dotnet-runtime-2.1 \ # dotnet-runtime-2.1 \
dotnet-hostfxr-2.1 \ # dotnet-hostfxr-2.1 \
dotnet-sdk-3.1 \ # dotnet-sdk-3.1 \
dotnet-targeting-pack-3.1 \ # dotnet-targeting-pack-3.1 \
dotnet-runtime-deps-3.1 \ # dotnet-runtime-deps-3.1 \
dotnet-runtime-3.1 \ # dotnet-runtime-3.1 \
dotnet-hostfxr-3.1 \ # dotnet-hostfxr-3.1 \
dotnet-apphost-pack-3.1 \ # dotnet-apphost-pack-3.1 \
dotnet-sdk-5.0 \ # dotnet-sdk-5.0 \
dotnet-targeting-pack-5.0 \ # dotnet-targeting-pack-5.0 \
dotnet-runtime-deps-5.0 \ # dotnet-runtime-deps-5.0 \
dotnet-runtime-5.0 \ # dotnet-runtime-5.0 \
dotnet-hostfxr-5.0 \ # dotnet-hostfxr-5.0 \
dotnet-apphost-pack-5.0 \ # dotnet-apphost-pack-5.0 \
dotnet-sdk-6.0 \ # dotnet-sdk-6.0 \
dotnet-targeting-pack-6.0 \ # dotnet-targeting-pack-6.0 \
dotnet-runtime-deps-6.0 \ # dotnet-runtime-deps-6.0 \
dotnet-runtime-6.0 \ # dotnet-runtime-6.0 \
dotnet-hostfxr-6.0 \ # dotnet-hostfxr-6.0 \
dotnet-apphost-pack-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 \ dotnet-host \
procdump \ procdump \
# procmon \ # procmon \

View File

@ -14,38 +14,6 @@ ENV GIT_SSH_VARIANT=ssh
RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \ RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \
chmod -R 700 /etc/gitlab-runner 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 bullseye test' > /etc/apt/sources.list.d/docker.list && \
echo 'deb https://download.docker.com/linux/debian bullseye 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 # gitlab runner setup
################################################################## ##################################################################
@ -54,7 +22,6 @@ RUN cd /tmp && \
chmod +x /tmp/install-gitlab-runner.sh && \ chmod +x /tmp/install-gitlab-runner.sh && \
bash /tmp/install-gitlab-runner.sh && \ bash /tmp/install-gitlab-runner.sh && \
# useradd --comment 'GitLab Runner' --create-home gitlab-runner --shell /bin/bash && \ # useradd --comment 'GitLab Runner' --create-home gitlab-runner --shell /bin/bash && \
usermod -aG docker gitlab-runner && \
cat /etc/passwd && \ cat /etc/passwd && \
gitlab-runner --version gitlab-runner --version

View File

@ -36,28 +36,34 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
libssl1.1 \ libssl1.1 \
libstdc++6 \ libstdc++6 \
zlib1g \ zlib1g \
dotnet-sdk-2.1 \ # dotnet-sdk-2.1 \
dotnet-runtime-deps-2.1 \ # dotnet-runtime-deps-2.1 \
dotnet-runtime-2.1 \ # dotnet-runtime-2.1 \
dotnet-hostfxr-2.1 \ # dotnet-hostfxr-2.1 \
dotnet-sdk-3.1 \ # dotnet-sdk-3.1 \
dotnet-targeting-pack-3.1 \ # dotnet-targeting-pack-3.1 \
dotnet-runtime-deps-3.1 \ # dotnet-runtime-deps-3.1 \
dotnet-runtime-3.1 \ # dotnet-runtime-3.1 \
dotnet-hostfxr-3.1 \ # dotnet-hostfxr-3.1 \
dotnet-apphost-pack-3.1 \ # dotnet-apphost-pack-3.1 \
dotnet-sdk-5.0 \ # dotnet-sdk-5.0 \
dotnet-targeting-pack-5.0 \ # dotnet-targeting-pack-5.0 \
dotnet-runtime-deps-5.0 \ # dotnet-runtime-deps-5.0 \
dotnet-runtime-5.0 \ # dotnet-runtime-5.0 \
dotnet-hostfxr-5.0 \ # dotnet-hostfxr-5.0 \
dotnet-apphost-pack-5.0 \ # dotnet-apphost-pack-5.0 \
dotnet-sdk-6.0 \ # dotnet-sdk-6.0 \
dotnet-targeting-pack-6.0 \ # dotnet-targeting-pack-6.0 \
dotnet-runtime-deps-6.0 \ # dotnet-runtime-deps-6.0 \
dotnet-runtime-6.0 \ # dotnet-runtime-6.0 \
dotnet-hostfxr-6.0 \ # dotnet-hostfxr-6.0 \
dotnet-apphost-pack-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 \ dotnet-host \
procdump \ procdump \
# procmon \ # procmon \