make - autocommit

This commit is contained in:
Zimovskii Anatolii 2022-11-17 21:56:11 +03:00
parent f825a5aa37
commit ef3189e6fc
Signed by: stam
GPG Key ID: 9911D9EF664EEE14
5 changed files with 59 additions and 45 deletions

View File

@ -24,7 +24,7 @@ ENV BuildDocker true
# export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \ # export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
# #
# Install packages # Install packages
ENV AMXX_VERSION=1.10 ENV AMXX_VERSION=1.9
ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include

View File

@ -188,12 +188,12 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
# 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-sdk-7.0 \
dotnet-targeting-pack-7.0 \ dotnet-targeting-pack-7.0 \
dotnet-runtime-deps-7.0 \ dotnet-runtime-deps-7.0 \
@ -206,17 +206,19 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
powershell-preview \ powershell-preview \
powershell powershell
RUN mkdir -p /usr/share/dotnet/host/fxr
# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache # Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
RUN dotnet help && \ RUN dotnet help && \
pwsh-preview -v && \ pwsh-preview -v && \
pwsh -v pwsh -v
# install dotnet tools # install dotnet tools
RUN dotnet tool list -g && \ #RUN dotnet tool list -g && \
dotnet tool install -g dotnet-script && \ # dotnet tool install -g dotnet-script && \
curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \ # curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
dotnet tool list -g && \ # dotnet tool list -g && \
dotnet-script --version # dotnet-script --version
################################################################## ##################################################################
@ -236,32 +238,39 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
ca-certificates-mono \ ca-certificates-mono \
mono-xsp4 mono-xsp4
################################################################## ##################################################################
# AMXXModX setup # teamcity AMXXModX setup
################################################################## ##################################################################
# #
# Reserved for future # Reserved for future
# export AMXX_CSTRIKE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-cstrike-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.9/amxmodx-latest-dod-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.9/amxmodx-latest-esf-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.9/amxmodx-latest-ns-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.9/amxmodx-latest-tfc-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.9/amxmodx-latest-base-linux` && \ # export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \
#
# Install packages # Install packages
ENV AMXX_VERSION=1.9 ENV AMXX_VERSION=1.10
ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include
ENV PATH=$PATH:$AMXX_BIN_PATH ENV PATH=$PATH:$AMXX_BIN_PATH
ENV LD_LIBRARY_PATH=$LD_LIBRARY_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` && \ 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 && \ 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 / && \ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \
mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \ mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
chmod +x $AMXX_BIN_PATH/amxxpc && \ chmod +x $AMXX_BIN_PATH/amxxpc && \
chmod +x $AMXX_BIN_PATH/compile.sh 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
################################################################## ##################################################################
# Android SDK # Android SDK

Binary file not shown.

View File

@ -52,12 +52,12 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
# 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-sdk-7.0 \
dotnet-targeting-pack-7.0 \ dotnet-targeting-pack-7.0 \
dotnet-runtime-deps-7.0 \ dotnet-runtime-deps-7.0 \
@ -70,17 +70,19 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
powershell-preview \ powershell-preview \
powershell powershell
RUN mkdir -p /usr/share/dotnet/host/fxr
# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache # Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
RUN dotnet help && \ RUN dotnet help && \
pwsh-preview -v && \ pwsh-preview -v && \
pwsh -v pwsh -v
# install dotnet tools # install dotnet tools
RUN dotnet tool list -g && \ #RUN dotnet tool list -g && \
dotnet tool install -g dotnet-script && \ # dotnet tool install -g dotnet-script && \
curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \ # curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
dotnet tool list -g && \ # dotnet tool list -g && \
dotnet-script --version # dotnet-script --version
################################################################## ##################################################################
# Mono # Mono

View File

@ -52,12 +52,12 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
# 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-sdk-7.0 \
dotnet-targeting-pack-7.0 \ dotnet-targeting-pack-7.0 \
dotnet-runtime-deps-7.0 \ dotnet-runtime-deps-7.0 \
@ -70,17 +70,20 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
powershell-preview \ powershell-preview \
powershell powershell
RUN mkdir -p /usr/share/dotnet/host/fxr
# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache # Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
RUN dotnet help && \ RUN dotnet help && \
pwsh-preview -v && \ pwsh-preview -v && \
pwsh -v pwsh -v
# install dotnet tools # install dotnet tools
RUN dotnet tool list -g && \ #RUN dotnet tool list -g && \
dotnet tool install -g dotnet-script && \ # dotnet tool install -g dotnet-script && \
curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \ # curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
dotnet tool list -g && \ # dotnet tool list -g && \
dotnet-script --version # dotnet-script --version
################################################################## ##################################################################
# cleaninig up # cleaninig up