make - autocommit

This commit is contained in:
Zimovskii Anatolii 2022-11-16 13:40:16 +03:00
parent 7f3755dde0
commit 67a17eeaf1
Signed by: stam
GPG Key ID: 9911D9EF664EEE14
4 changed files with 7 additions and 3 deletions

View File

@ -40,7 +40,6 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
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 && \
tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
chown -R buildagent:buildagent $AMXX_INC_PATH && \
chmod -R 700 $AMXX_INC_PATH && \ chmod -R 700 $AMXX_INC_PATH && \
chmod +x $AMXX_BIN_PATH/compile.sh chmod +x $AMXX_BIN_PATH/compile.sh

View File

@ -39,7 +39,6 @@ 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 / && \ 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 && \
tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \ tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
chown -R buildagent:buildagent $AMXX_INC_PATH && \
chmod -R 700 $AMXX_INC_PATH && \ chmod -R 700 $AMXX_INC_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

View File

@ -32,7 +32,7 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
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 && \ tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
chown -R buildagent:buildagent $AMXX_INC_PATH && \ chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \
chmod -R 700 $AMXX_INC_PATH && \ chmod -R 700 $AMXX_INC_PATH && \
amxxpc --help 2>&1 | head -n 1 amxxpc --help 2>&1 | head -n 1

View File

@ -18,9 +18,12 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV AMXX_VERSION=1.9 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 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
COPY inc.tar /tmp
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.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 && \ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \
@ -28,6 +31,9 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
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 && \
chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \
chmod -R 700 $AMXX_INC_PATH && \
amxxpc --help 2>&1 | head -n 1 amxxpc --help 2>&1 | head -n 1
################################################################## ##################################################################