From f30361ab9988eb19e6044612db1fbc344db16afd Mon Sep 17 00:00:00 2001 From: Laura Demkowicz-Duffy Date: Fri, 10 Jun 2022 19:09:28 +0100 Subject: [PATCH 1/6] Cleanup AWS script Add redundant scrim server to the compose file with correct params Remove git commands Use install instead of mkdir + chmod --- cs_aws.sh | 41 ++++++++++------------------------------- docker-compose.yml | 25 +++++++++++++++++++------ 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/cs_aws.sh b/cs_aws.sh index de13c96..e9d24c8 100644 --- a/cs_aws.sh +++ b/cs_aws.sh @@ -12,39 +12,18 @@ sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker- sudo chmod +x /usr/local/bin/docker-compose docker-compose --version -# Clone repo locally -mkdir ~/cs_server_1/ -git clone https://github.com/FragSoc/csgo-server-scrim.git ~/cs_server_1/. -mkdir ~/cs_server_2/ -git clone https://github.com/FragSoc/csgo-server-scrim.git ~/cs_server_2/. - -# Configure ports and source tokens -sed -i 's/SRCDS_TOKEN=309E76122D3C7522154AC7513C51984E/SRCDS_TOKEN=3C1836105A719D05E6E2377A823F66E1/g' ~/cs_server_1/docker-compose.yml - -sed -i 's/SRCDS_TOKEN=309E76122D3C7522154AC7513C51984E/SRCDS_TOKEN=5BA590C6B96839FC248667027F2E8D79/g' ~/cs_server_2/docker-compose.yml -sed -i 's/SRCDS_PORT=27015/SRCDS_PORT=27016/g' ~/cs_server_2/docker-compose.yml -sed -i 's/SRCDS_TV_PORT=27020/SRCDS_TV_PORT=27021/g' ~/cs_server_2/docker-compose.yml - # Configure passwords -sed -i 's/hostname "UoY Esports"/hostname "UoY Esports #1"/g' ~/cs_server_1/custom_server_template.cfg -sed -i 's/sv_password "default"/sv_password "z6gMtKvm"/g' ~/cs_server_1/custom_server_template.cfg -sed -i 's/rcon_password "default"/rcon_password "6zzPYFwQ"/g' ~/cs_server_1/custom_server_template.cfg +# sed -i 's/hostname "UoY Esports"/hostname "UoY Esports #1"/g' ~/cs_server_1/custom_server_template.cfg +# sed -i 's/sv_password "default"/sv_password "z6gMtKvm"/g' ~/cs_server_1/custom_server_template.cfg +# sed -i 's/rcon_password "default"/rcon_password "6zzPYFwQ"/g' ~/cs_server_1/custom_server_template.cfg -sed -i 's/hostname "UoY Esports"/hostname "UoY Esports #2"/g' ~/cs_server_2/custom_server_template.cfg -sed -i 's/sv_password "default"/sv_password "mLMQ7LgM"/g' ~/cs_server_2/custom_server_template.cfg -sed -i 's/rcon_password "default"/rcon_password "zuKUW8wR"/g' ~/cs_server_2/custom_server_template.cfg +# sed -i 's/hostname "UoY Esports"/hostname "UoY Esports #2"/g' ~/cs_server_2/custom_server_template.cfg +# sed -i 's/sv_password "default"/sv_password "mLMQ7LgM"/g' ~/cs_server_2/custom_server_template.cfg +# sed -i 's/rcon_password "default"/rcon_password "zuKUW8wR"/g' ~/cs_server_2/custom_server_template.cfg -# Make install directory -mkdir ~/cs_server_1/csgo-data -chmod 777 ~/cs_server_1/csgo-data -mkdir ~/cs_server_2/csgo-data -chmod 777 ~/cs_server_2/csgo-data +# Make install directories +install -m 0777 -d ./csgo-data1 +install -m 0777 -d ./csgo-data2 # Run container composes -sudo docker-compose -f ~/cs_server_1/docker-compose.yml up -d -sudo docker-compose -f ~/cs_server_2/docker-compose.yml up -d - - -# rsync -av csgo-server-scrim/ csgo-server-scrim_2/ - - +sudo docker-compose up -d diff --git a/docker-compose.yml b/docker-compose.yml index 9755602..b9725ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,25 @@ version: "3" -services: - csgo-scrim: +services: + scrim1: build: . - volumes: - - ./csgo-data:/home/steam/csgo-dedicated/ + image: fragsoc/csgo-server-scrim + volumes: + - ./csgo-data1:/home/steam/csgo-dedicated/ network_mode: "host" - environment: - - SRCDS_TOKEN=309E76122D3C7522154AC7513C51984E + environment: + - SRCDS_TOKEN=3C1836105A719D05E6E2377A823F66E1 - SRCDS_PORT=27015 - SRCDS_TV_PORT=27020 - SCRIM=true # Set false for a team structured config + + scrim1: + build: . + image: fragsoc/csgo-server-scrim + volumes: + - ./csgo-data1:/home/steam/csgo-dedicated/ + network_mode: "host" + environment: + - SRCDS_TOKEN=5BA590C6B96839FC248667027F2E8D79 + - SRCDS_PORT=27016 + - SRCDS_TV_PORT=27021 + - SCRIM=true # Set false for a team structured config From 4beb0c9deb0805ec7d439457a09d5594021059b3 Mon Sep 17 00:00:00 2001 From: Laura Demkowicz-Duffy Date: Fri, 10 Jun 2022 19:17:40 +0100 Subject: [PATCH 2/6] fix: rename scrim1 -> scrim2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index b9725ab..0e6234a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - SRCDS_TV_PORT=27020 - SCRIM=true # Set false for a team structured config - scrim1: + scrim2: build: . image: fragsoc/csgo-server-scrim volumes: From e7d416b7d40ac8c32f464549ef3b30fee9e70e8b Mon Sep 17 00:00:00 2001 From: Laura Demkowicz-Duffy Date: Fri, 10 Jun 2022 21:45:10 +0100 Subject: [PATCH 3/6] Add shebang to shell script and slim docker-compose --- cs_aws.sh | 3 +++ docker-compose.yml | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) mode change 100644 => 100755 cs_aws.sh diff --git a/cs_aws.sh b/cs_aws.sh old mode 100644 new mode 100755 index e9d24c8..4c4524c --- a/cs_aws.sh +++ b/cs_aws.sh @@ -1,3 +1,6 @@ +#!/bin/sh +set -eux + # Install Docker sudo apt update sudo apt install apt-transport-https ca-certificates curl software-properties-common -y diff --git a/docker-compose.yml b/docker-compose.yml index 0e6234a..b6b7b03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,15 @@ version: "3" -services: - scrim1: + +x-defaults: &defaults build: . image: fragsoc/csgo-server-scrim + network_mode: "host" + +services: + scrim1: + <<: *defaults volumes: - ./csgo-data1:/home/steam/csgo-dedicated/ - network_mode: "host" environment: - SRCDS_TOKEN=3C1836105A719D05E6E2377A823F66E1 - SRCDS_PORT=27015 @@ -13,11 +17,9 @@ services: - SCRIM=true # Set false for a team structured config scrim2: - build: . - image: fragsoc/csgo-server-scrim + <<: *defaults volumes: - ./csgo-data1:/home/steam/csgo-dedicated/ - network_mode: "host" environment: - SRCDS_TOKEN=5BA590C6B96839FC248667027F2E8D79 - SRCDS_PORT=27016 From b96af7f5f328bea49db72be6574a3e7c6eadde2f Mon Sep 17 00:00:00 2001 From: Laura Demkowicz-Duffy Date: Fri, 10 Jun 2022 22:14:14 +0100 Subject: [PATCH 4/6] feat: restart containers on failure --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index b6b7b03..82f3597 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ x-defaults: &defaults build: . image: fragsoc/csgo-server-scrim network_mode: "host" + restart: unless_stopped services: scrim1: From a4f62af9998ec2f1f6631c22c9184e9f1fb1517e Mon Sep 17 00:00:00 2001 From: Laura Demkowicz-Duffy Date: Fri, 10 Jun 2022 22:33:16 +0100 Subject: [PATCH 5/6] fix: don't send massive stuff to docker --- .dockerignore | 2 +- .gitignore | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index c647ea4..7f0c88d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1 @@ -csgo-data \ No newline at end of file +csgo-data* diff --git a/.gitignore b/.gitignore index c647ea4..197d815 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -csgo-data \ No newline at end of file +csgo-data* +inventory* From e5ecef696921e41ddeb80a41ed4e5af2d442b031 Mon Sep 17 00:00:00 2001 From: Laura Demkowicz-Duffy Date: Fri, 10 Jun 2022 22:36:01 +0100 Subject: [PATCH 6/6] fix: pin compose spec version and fix restart value --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 82f3597..fb58942 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ -version: "3" +version: "3.4" x-defaults: &defaults build: . image: fragsoc/csgo-server-scrim network_mode: "host" - restart: unless_stopped + restart: unless-stopped services: scrim1: