summaryrefslogtreecommitdiffhomepage
path: root/develop/cli/Dockerfile
diff options
context:
space:
mode:
authorTed John <[email protected]>2019-05-01 23:59:10 +0000
committerTed John <[email protected]>2019-05-02 00:00:16 +0000
commit1bcb98d8df6417438d7d9cd7a68d2a80e9442e31 (patch)
treed9e8c7467bc694f6ef3ce4b1418d09d986888079 /develop/cli/Dockerfile
parent36ddd9b110ad1918d98cda26cbb8f8018d80af28 (diff)
downloadopenrct2-docker-1bcb98d8df6417438d7d9cd7a68d2a80e9442e31.tar.gz
openrct2-docker-1bcb98d8df6417438d7d9cd7a68d2a80e9442e31.zip
Add 0.2.2 image and update develop to Ubuntu 19.04
Diffstat (limited to 'develop/cli/Dockerfile')
-rw-r--r--develop/cli/Dockerfile12
1 files changed, 6 insertions, 6 deletions
diff --git a/develop/cli/Dockerfile b/develop/cli/Dockerfile
index f720fa2..9eb063f 100644
--- a/develop/cli/Dockerfile
+++ b/develop/cli/Dockerfile
@@ -1,9 +1,9 @@
# Build OpenRCT2
-FROM ubuntu:18.04 AS build-env
+FROM ubuntu:19.04 AS build-env
RUN apt-get update \
- && apt-get install --no-install-recommends -y git cmake pkg-config ninja-build clang-5.0 libsdl2-dev libspeexdsp-dev libjansson-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev libssl-dev libicu-dev \
- && ln -s /usr/bin/clang-5.0 /usr/bin/clang \
- && ln -s /usr/bin/clang++-5.0 /usr/bin/clang++
+ && apt-get install --no-install-recommends -y git cmake pkg-config ninja-build clang-6.0 libsdl2-dev libspeexdsp-dev libjansson-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev libssl-dev libicu-dev \
+ && ln -s /usr/bin/clang-6.0 /usr/bin/clang \
+ && ln -s /usr/bin/clang++-6.0 /usr/bin/clang++
ENV OPENRCT2_REF develop
WORKDIR /openrct2
@@ -14,10 +14,10 @@ RUN git -c http.sslVerify=false clone --depth 1 -b $OPENRCT2_REF https://github.
&& ninja -k0 install
# Build runtime image
-FROM ubuntu:18.04
+FROM ubuntu:19.04
RUN apt-get update
RUN apt-get -y upgrade
-RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng16-16 libzip4 libcurl4 libfreetype6 libfontconfig1 libicu60
+RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng16-16 libzip5 libcurl4 libfreetype6 libfontconfig1 libicu63
# Install OpenRCT2
COPY --from=build-env /openrct2-install /openrct2-install