Compare commits

..

No commits in common. "master" and "gitea-images" have entirely different histories.

4 changed files with 21 additions and 32 deletions

View file

@ -1,16 +1,24 @@
--- ---
kind: pipeline
type: docker
name: build-docker
platform:
os: linux
arch: amd64
steps: steps:
- name: tf2-dm - name: tf2-dm
image: woodpeckerci/plugin-docker-buildx image: plugins/docker
settings: settings:
registry: git.snrd.eu repo: spaenny/dm-server
repo: git.snrd.eu/spenny.tf/dm-server cache_from: "spaenny/dm-server:latest"
cache_from: "git.snrd.eu/spenny.tf/dm-server:latest"
auto_tag: true auto_tag: true
context: ./ context: ./
dockerfile: ./Dockerfile dockerfile: ./Dockerfile
username: username:
from_secret: gitea_username from_secret: docker_username
password: password:
from_secret: gitea_token from_secret: docker_password

View file

@ -1,20 +0,0 @@
---
kind: pipeline
type: docker
name: build-docker
steps:
- name: tf2-dm
image: plugins/docker
settings:
registry: git.snrd.eu
repo: git.snrd.eu/spenny.tf/dm-server
cache_from: "git.snrd.eu/spenny.tf/dm-server:latest"
auto_tag: true
context: ./
dockerfile: ./Dockerfile
username:
from_secret: gitea_username
password:
from_secret: gitea_token

View file

@ -1,18 +1,18 @@
FROM ghcr.io/melkortf/tf2-dm:latest FROM melkortf/tf2-dm:latest
LABEL maintainer="philipp@boehm.sh" LABEL maintainer="philipp@boehm.sh"
RUN \ RUN \
# download plugins # download plugins
wget -nv "https://github.com/dordnung/System2/releases/download/v3.3.2/system2.zip" -O system2.zip \ wget -nv "https://github.com/dordnung/System2/releases/download/v3.3.2/system2.zip" -O system2.zip \
&& wget -nv "https://github.com/sapphonie/StAC-tf2/releases/download/v6.1.6/stac.zip" -O stac.zip \ && wget -nv "https://github.com/sapphonie/StAC-tf2/releases/download/v5.4.1/stac.zip" -O stac.zip \
&& wget -nv "https://github.com/sapphonie/sourcemod-nativevotes-updated/releases/download/workflow-build61/nativevotes_sm_1.11.zip" -O nativevotes.zip \ && wget -nv "https://github.com/sapphonie/sourcemod-nativevotes-updated/releases/download/workflow-build19/nativevotes.zip" -O nativevotes.zip \
&& wget -nv "https://github.com/ErikMinekus/sm-advertisements/releases/download/2.1.1/release.tar.gz" -O advertisements.tar.gz \ && wget -nv "https://github.com/ErikMinekus/sm-advertisements/releases/download/2.1.1/release.tar.gz" -O advertisements.tar.gz \
&& wget -nv "http://users.alliedmods.net/~kyles/builds/SteamWorks/SteamWorks-git132-linux.tar.gz" -O SteamWorks.tar.gz \ && wget -nv "http://users.alliedmods.net/~kyles/builds/SteamWorks/SteamWorks-git132-linux.tar.gz" -O SteamWorks.tar.gz \
&& wget -nv "https://gitlab.com/Zipcore/Discord/-/raw/master/plugins/discord.smx" -O discord.smx \ && wget -nv "https://gitlab.com/Zipcore/Discord/-/raw/master/plugins/discord.smx" -O discord.smx \
&& wget -nv "https://gitlab.com/Zipcore/Discord/-/raw/master/plugins/discord_sourcebans.smx" -O discord_sourcebans.smx \ && wget -nv "https://gitlab.com/Zipcore/Discord/-/raw/master/plugins/discord_sourcebans.smx" -O discord_sourcebans.smx \
&& wget -nv "https://gitlab.com/Zipcore/Discord/-/raw/master/plugins/discord_sourcecomms.smx" -O discord_sourcecomms.smx \ && wget -nv "https://gitlab.com/Zipcore/Discord/-/raw/master/plugins/discord_sourcecomms.smx" -O discord_sourcecomms.smx \
&& wget -nv "https://github.com/eaasye/soapbalancer/raw/master/soapbalancer.smx" -O soapbalancer.smx \ && wget -nv "https://github.com/eaasye/soapbalancer/raw/master/soapbalancer.smx" -O soapbalancer.smx \
&& wget -nv "https://github.com/JoinedSenses/sm-ext-socket/releases/download/v0.2/socket.ext.so" -O socket.ext.so \ && wget -nv "https://forums.alliedmods.net/attachment.php?attachmentid=83286&d=1299423920" -O socket.zip \
# install plugins # install plugins
&& unzip -o system2.zip -d "${SERVER_DIR}/tf/addons/sourcemod/" \ && unzip -o system2.zip -d "${SERVER_DIR}/tf/addons/sourcemod/" \
&& unzip -o stac.zip -d "${SERVER_DIR}/tf/addons/sourcemod/" \ && unzip -o stac.zip -d "${SERVER_DIR}/tf/addons/sourcemod/" \
@ -23,8 +23,9 @@ RUN \
&& mv discord_sourcebans.smx "${SERVER_DIR}/tf/addons/sourcemod/plugins/discord_sourcebans.smx" \ && mv discord_sourcebans.smx "${SERVER_DIR}/tf/addons/sourcemod/plugins/discord_sourcebans.smx" \
&& mv discord_sourcecomms.smx "${SERVER_DIR}/tf/addons/sourcemod/plugins/discord_sourcecomms.smx" \ && mv discord_sourcecomms.smx "${SERVER_DIR}/tf/addons/sourcemod/plugins/discord_sourcecomms.smx" \
&& mv soapbalancer.smx "${SERVER_DIR}/tf/addons/sourcemod/plugins/soapbalancer.smx" \ && mv soapbalancer.smx "${SERVER_DIR}/tf/addons/sourcemod/plugins/soapbalancer.smx" \
&& mv socket.ext.so "${SERVER_DIR}/tf/addons/sourcemod/extensions/" \ && unzip -o socket.zip -d "${SERVER_DIR}/tf/" \
# clean everything up # clean everything up
&& rm system2.zip stac.zip nativevotes.zip advertisements.tar.gz SteamWorks.tar.gz socket.zip \
&& rm "${SERVER_DIR}/tf/addons/sourcemod/plugins/admin-flatfile.smx" && rm "${SERVER_DIR}/tf/addons/sourcemod/plugins/admin-flatfile.smx"
COPY server.cfg.template "${SERVER_DIR}/tf/cfg/server.cfg.template" COPY server.cfg.template "${SERVER_DIR}/tf/cfg/server.cfg.template"

View file

@ -44,7 +44,7 @@ sm_projectiles_ignore_teammates 1
sm_remove_halloween_souls 1 sm_remove_halloween_souls 1
sm_remove_medic_attach_speed 0 sm_remove_medic_attach_speed 0
sm_remove_pipe_spin 0 sm_remove_pipe_spin 0
sm_rest_in_peace_rick_may 255 sm_rest_in_peace_rick_may 0
sm_winger_jump_bonus_when_fully_deployed 1 sm_winger_jump_bonus_when_fully_deployed 1
sm_override_pipe_size 4.0 sm_override_pipe_size 4.0
sm_projectiles_collide_with_cylinders 1 sm_projectiles_collide_with_cylinders 1