commit 091970a1
Updated the CI version to use a modern version of Ubuntu
Changed files
| D | source/misc/docker/Dockerfile.Ubuntu14.04build before |
| A | source/misc/docker/Dockerfile.Ubuntu20.04build |
| M | travis_build.script before |
diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build b/source/misc/docker/Dockerfile.Ubuntu14.04build
deleted file mode 100644
index c841376..0000000
--- a/source/misc/docker/Dockerfile.Ubuntu14.04build
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:14.04
-
-RUN apt-get update && apt-get install -y build-essential libphysfs-dev libboost-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.1.0
-
-RUN cd /staging/blockattack-game && \
-./packdata.sh && \
-cmake . && \
-make
diff --git a/source/misc/docker/Dockerfile.Ubuntu20.04build b/source/misc/docker/Dockerfile.Ubuntu20.04build
new file mode 100644
index 0000000..4f4451d
--- /dev/null
+++ b/source/misc/docker/Dockerfile.Ubuntu20.04build
@@ -0,0 +1,17 @@
+FROM ubuntu:20.04
+
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN apt-get update && apt-get install -y build-essential libphysfs-dev libboost-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.1.0
+
+RUN cd /staging/blockattack-game && \
+./packdata.sh && \
+cmake . && \
+make
diff --git a/travis_build.script b/travis_build.script
index 494b1aa..fe30601 100755
--- a/travis_build.script
+++ b/travis_build.script
@@ -4,5 +4,5 @@ set -e
# First check for formatting errors
bash source/misc/lint/runLint.sh
-docker build -f source/misc/docker/Dockerfile.Ubuntu14.04build . -t blockattack_test
+docker build -f source/misc/docker/Dockerfile.Ubuntu20.04build . -t blockattack_test
docker build -f source/misc/docker/Dockerfile.WindoesBuild . -t blockattack_test