chore: update docker files to latest dev-stage

Author: habecker

docker/base.Dockerfile

@@ -1,7 +1,7 @@
-FROM ubuntu:xenial
-RUN dpkg --add-architecture i386
-RUN apt-get update && apt-get install -y python3.5-dev:i386
-RUN apt-get install -f
+ARG BASE
+
+FROM $BASE
+
 
 RUN apt-get update && apt-get install -y build-essential g++ cmake g++-multilib git
 RUN apt-get install -f
@@ -19,4 +19,23 @@ RUN pip install ply
 RUN mkdir /root/sampgdk/build
 RUN cd /root/sampgdk/build && cmake .. -DSAMP_SDK_ROOT=/root/sampsdk -DSAMPGDK_STATIC=ON -DSAMPGDK_BUILD_AMALGAMATION=ON
 RUN cmake --build /root/sampgdk/build --config Release
-RUN cmake --build /root/sampgdk/build --config Release --target install
+RUN cmake --build /root/sampgdk/build --config Release --target install
+
+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-dev:i386 libpython3.8-dev:i386
+# RUN apt-get install -f
+
+# RUN apt-get update && apt-get install -y wget
+
+# RUN mkdir /root/python
+# RUN cd /root/python && wget https://github.com/python/cpython/archive/v3.8.3.tar.gz && tar xvf v3.8.3.tar.gz
+
+
+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/

docker/compile.Dockerfile

@@ -1,3 +1,9 @@
-docker build -f ./base.Dockerfile -t pysamp/base ../
-docker build -f ./compile.Dockerfile -t pysamp/compile ../
-docker run  -v "$(cd ../ && pwd)"/target:/target --rm pysamp/compile
+
+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/make

@@ -3,14 +3,14 @@ project(PySAMP)
 add_compile_options(-std=c++11)
 
 
-cmake_minimum_required(VERSION 3.12)
+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.2")
+set(PYTHON_MIN_VERSION "3.5")
 
-find_package (Python ${PYTHON_MIN_VERSION})
-find_package (PythonLibs ${PYTHON_MIN_VERSION})
+find_package (PythonInterp ${PYTHON_MIN_VERSION} REQUIRED)
+find_package (PythonLibs ${PYTHON_MIN_VERSION} REQUIRED)
 
 find_library (SAMPGDK_LIBRARY
     NAMES sampgdk sampgdk4s