From 543efd8822eff70a199eda6cad952ac7e181596b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 16 May 2018 00:11:24 +0200 Subject: [PATCH] Fix #7497: openrct2-cli docker image is broken (#7524) Update openrct2-cli docker file for Ubuntu 18.04. See https://github.com/OpenRCT2/OpenRCT2/pull/7523 Also includes a basic test to verify load-ability of produced binary. --- dockerfiles/openrct2-cli/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dockerfiles/openrct2-cli/Dockerfile b/dockerfiles/openrct2-cli/Dockerfile index bb24093110..50c417c647 100644 --- a/dockerfiles/openrct2-cli/Dockerfile +++ b/dockerfiles/openrct2-cli/Dockerfile @@ -8,15 +8,16 @@ RUN mkdir build \ && ninja -k0 install # Build runtime image -FROM ubuntu:16.04 +FROM ubuntu:18.04 RUN apt-get update RUN apt-get -y upgrade -RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng12-0 libzip4 libcurl3 libfreetype6 libfontconfig1 +RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng16-16 libzip4 libcurl4 libfreetype6 libfontconfig1 # Install OpenRCT2 COPY --from=build-env /openrct2-install /openrct2-install RUN rsync -a /openrct2-install/* / \ - && rm -rf /openrct2-install + && rm -rf /openrct2-install \ + && /openrct2-cli --version # Done ENTRYPOINT ["openrct2-cli"]