feat: add dockerfile to run a server

Author: habecker

.gitignore

@@ -21,4 +21,5 @@ test/
 gamemodes/reloadable-gamemode/
 gamemodes/remote-client/
 gamemodes/remote-server/
-server/
+server/
+target/

docker/base.Dockerfile renamed to docker/make.Dockerfile

@@ -37,5 +37,5 @@ RUN apt-get update && apt-get install -y python3.8-dev:i386 libpython3.8-dev:i38
 WORKDIR /usr/src/pysamp
 COPY . .
 
-RUN [ "cmake", "./src", "-G", "Unix Makefiles", "-DSAMPSDK_DIR=/root/sampsdk", "-DSAMPGDK_DIR=/root/sampgdk", "-DCMAKE_BUILD_TYPE=Debug" ]    
-CMD make; cp ./PySAMP.so /target/
+RUN [ "cmake", "./src", "-G", "Unix Makefiles", "-DSAMPSDK_DIR=/root/sampsdk", "-DSAMPGDK_DIR=/root/sampgdk", "-DCMAKE_BUILD_TYPE=Debug", "-DPYTHON_INCLUDE_DIRS=/usr/include/i386-linux-gnu/python3.8", "-DPYTHON_LIBRARY=/usr/lib/i386-linux-gnu/libpython3.8.so" ]    
+CMD make; cp ./PySAMP.so /target/

docker/make renamed to docker/make.sh

@@ -1,9 +1,9 @@
+docker build -f ./make.Dockerfile -t pysamp/make --build-arg BASE=ubuntu:bionic ../
 
-docker build -f ./base.Dockerfile -t pysamp/bionic --build-arg BASE=ubuntu:bionic ../
 #docker build -f ./base.Dockerfile -t pysamp/eoan --build-arg BASE=ubuntu:eoan ../
 #docker build -f ./base.Dockerfile -t pysamp/focal --build-arg BASE=ubuntu:focal ../
 
 #docker build -f ./base.Dockerfile -t pysamp/stretch --build-arg BASE=debian:stretch ../
 #docker build -f ./base.Dockerfile -t pysamp/buster --build-arg BASE=debian:buster ../
 
-docker run  -v "$(cd ../ && pwd)"/target:/target --rm pysamp/stretch
+docker run --name pysamp -v "$(cd ../ && pwd)"/target:/target --rm pysamp/make

docker/scripts/check_server_config.py

@@ -0,0 +1,32 @@
+#!python3
+import sys, os, random, string
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        print("Error, missing argument for server.cfg path")
+        exit(1)
+    updated_config = ''
+    added_plugins = False
+    with open(os.path.join(sys.argv[1], 'server.cfg')) as f:
+        for line in f:
+            if line.lstrip()[0] == '#':
+                continue
+            line = line.rstrip(' \r\n')
+            k,v = line.split(' ', 1)
+            if k == 'plugins' and 'PySAMP.so' not in v:
+                added_plugins = True
+                v += 'PySAMP.so'
+            elif k == 'plugins' and 'PySAMP.so' in v:
+                added_plugins = True
+            if k == 'rcon_password' and v == 'changeme':
+                print("Changed default password!")
+                v = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(12))
+            updated_config += '%s %s\n' % (k, v)
+
+        if not added_plugins:
+            updated_config += 'plugins PySAMP.so\n'
+
+    with open(os.path.join(sys.argv[1], 'server.cfg'), 'w') as f:
+        f.write(updated_config)
+        
+        

docker/scripts/start_server.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+./samp03svr 2>&1

docker/server.Dockerfile

@@ -0,0 +1,14 @@
+ARG BASE
+
+FROM $BASE
+
+# install dependencies
+RUN dpkg --add-architecture i386
+RUN apt-get update && apt-get install -y software-properties-common
+RUN add-apt-repository ppa:deadsnakes/ppa
+RUN apt-get update && apt-get install -y python3.8:i386 libpython3.8:i386
+RUN apt-get update && apt-get install -y libstdc++6:i386
+
+WORKDIR /server
+
+CMD "./start_server.sh"

docker/server.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# build PySAMP
+./make.sh
+
+# create server dir if it doesn't exist
+if [[ ! -d ../server ]]; then
+    mkdir ../server
+    cd ../server
+    wget http://files.sa-mp.com/samp037svr_R2-1.tar.gz
+    tar xvf samp037svr_R2-1.tar.gz
+    mv samp03/* ./
+    rm -rf samp03
+    cd ../docker
+fi
+
+# create plugins folder
+if [[ ! -d ../server/plugins ]]; then
+    mkdir ../server/plugins
+fi
+
+# copy plugin to server
+cp ../target/PySAMP.so ../server/plugins/
+
+# create python gamemode directory (if it doesn't exist)
+if [[ ! -d ../server/python ]]; then
+    mkdir ../server/python
+    cp -r ../gamemodes/empty/* ../server/python
+fi
+
+# copy start script to server
+cp scripts/start_server.sh ../server
+chmod +x ../server/start_server.sh
+
+# add plugin to server config and set password if it's still changeme
+python scripts/check_server_config.py ../server/
+
+docker build -f ./server.Dockerfile -t pysamp/server --build-arg BASE=ubuntu:bionic ../
+docker run --name pysamp_server -v "$(cd ../ && pwd)"/server:/server -p 7777:7777 -p 7777:7777/udp --rm -it pysamp/server

src/CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.7)
 list(APPEND CMAKE_MODULE_PATH ${SAMPGDK_DIR}/cmake)
 
 add_compile_options(-std=c++11)
-set(PYTHON_MIN_VERSION "3.5")
+set(PYTHON_MIN_VERSION 3.8)
 
 find_package (PythonInterp ${PYTHON_MIN_VERSION} REQUIRED)
 find_package (PythonLibs ${PYTHON_MIN_VERSION} REQUIRED)
@@ -27,12 +27,12 @@ include_directories(
   ${SAMPSDK_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/bindings
   ${CMAKE_CURRENT_SOURCE_DIR}/pysamp
-  ${PYTHON_INCLUDE_DIR}
+  ${PYTHON_INCLUDE_DIRS}
 )
 
 message(STATUS "PYTHON_LIBRARY = ${PYTHON_LIBRARY}")
 message(STATUS "PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}")
-message(STATUS "PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}")
+message(STATUS "PYTHON_INCLUDE_DIRS = ${PYTHON_INCLUDE_DIRS}")
 message(STATUS "SAMPGDK_LIBRARY = ${SAMPGDK_LIBRARY}")
 
 add_definitions(-DSAMPGDK_AMALGAMATION)
@@ -54,8 +54,6 @@ add_samp_plugin(PySAMP
   bindings/samp.h
   bindings/const.h
   bindings/const.cpp
-  test/callbackstest.h
-  test/callbackstest.cpp
 )
 
 target_link_libraries(PySAMP ${SAMPGDK_LIBRARY})