git repos / blockattack-game

commit 8c45a9c9

Poul Sander · 2022-12-30 11:22
8c45a9c95e0a8608a30676105ab3923b6dd0dd0d patch · browse files
parent 643bbc8117c0d287bb8ee8761e459076d9971085 

Removed 16.04 builds and added 22.04 builds.
32 bit releases was dropped with 2.7.0 so we also remove it. It was broken anyway as there are no longer relevant docker images for building 32 bit applications.

Changed files

D source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone before
D source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone32 before
A source/misc/docker/Dockerfile.Ubuntu22.04build
diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone deleted file mode 100644 index 2db270e..0000000 --- a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone +++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y build-essential cmake pkg-config libfreetype6-dev libvorbis-dev libgl1-mesa-dev libpulse-dev libpng12-dev zip gettext
-
-COPY source/misc/standalone/compile_requirements.sh /
-RUN /compile_requirements.sh
-
-
-
-COPY . /staging/blockattack-game
-
-ENV BLOCKATTACK_VERSION 2.9.0-SNAPSHOT
-
-RUN cd /staging/blockattack-game && \
-./packdata.sh && \
-cmake -D Boost_USE_STATIC_LIBS=ON -D INSTALL_DATA_DIR=. -D CMAKE_INSTALL_PREFIX=. -D STANDALONE=1 . && make
diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone32 b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone32 deleted file mode 100644 index d3b93c4..0000000 --- a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone32 +++ /dev/null
@@ -1,23 +0,0 @@
-FROM ioft/i386-ubuntu:16.04
-
-RUN apt-get update && apt-get install -y build-essential cmake pkg-config libfreetype6-dev libvorbis-dev libgl1-mesa-dev libpulse-dev libpng12-dev zip gettext
-
-RUN apt-get update && apt-get install -y python-software-properties software-properties-common && \
-add-apt-repository ppa:ubuntu-toolchain-r/test && \
-apt-get update && \
-apt-get install -y gcc-4.8 g++-4.8 && \
-update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 && \
-update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
-
-COPY source/misc/standalone/compile_requirements.sh /
-RUN /compile_requirements.sh
-
-
-
-COPY . /staging/blockattack-game
-
-ENV BLOCKATTACK_VERSION 2.3.0
-
-RUN cd /staging/blockattack-game && \
-./packdata.sh && \
-cmake -D Boost_USE_STATIC_LIBS=ON -D INSTALL_DATA_DIR=. -D CMAKE_INSTALL_PREFIX=. -D STANDALONE=1 . && make
diff --git a/source/misc/docker/Dockerfile.Ubuntu22.04build b/source/misc/docker/Dockerfile.Ubuntu22.04build new file mode 100644 index 0000000..0f4a458 --- /dev/null +++ b/source/misc/docker/Dockerfile.Ubuntu22.04build
@@ -0,0 +1,19 @@
+FROM ubuntu:22.04
+
+# Set timezone to UTC. This prevents apt-get install SOME-PACKAGES from asking for timezone during setup
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+
+RUN apt-get update && apt-get install -yy build-essential libphysfs-dev libboost-dev libfmt-dev cmake libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libboost-program-options-dev libutfcpp-dev zip gettext
+
+RUN mkdir -p /staging/blockattack-game
+
+COPY . /staging/blockattack-game
+
+ENV BLOCKATTACK_VERSION 2.9.0-SNAPSHOT
+
+RUN cd /staging/blockattack-game && \
+./packdata.sh && \
+cmake . && \
+make