diff options
| author | Michał Janiszewski <[email protected]> | 2020-04-16 20:41:46 +0200 |
|---|---|---|
| committer | Michał Janiszewski <[email protected]> | 2020-04-16 21:07:57 +0200 |
| commit | 1eabb6fd2f731694931226f2c405c5c3ac06a0ab (patch) | |
| tree | 1eae9228c731abbc54a05aca9201a9201f376ff2 /develop | |
| parent | 6201b6adafd476aebc280dc67d4fd5ae53d9510b (diff) | |
| download | openrct2-docker-1eabb6fd2f731694931226f2c405c5c3ac06a0ab.tar.gz openrct2-docker-1eabb6fd2f731694931226f2c405c5c3ac06a0ab.zip | |
Move develop to current Ubuntu 20.04 LTS
Diffstat (limited to 'develop')
| -rw-r--r-- | develop/cli/Dockerfile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/develop/cli/Dockerfile b/develop/cli/Dockerfile index 9eb063f..b3ddb47 100644 --- a/develop/cli/Dockerfile +++ b/develop/cli/Dockerfile @@ -1,9 +1,10 @@ # Build OpenRCT2 -FROM ubuntu:19.04 AS build-env +FROM ubuntu:20.04 AS build-env +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ - && 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++ + && apt-get install --no-install-recommends -y git cmake pkg-config ninja-build clang-10 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-10 /usr/bin/clang \ + && ln -s /usr/bin/clang++-10 /usr/bin/clang++ ENV OPENRCT2_REF develop WORKDIR /openrct2 @@ -14,10 +15,10 @@ RUN git -c http.sslVerify=false clone --depth 1 -b $OPENRCT2_REF https://github. && ninja -k0 install # Build runtime image -FROM ubuntu:19.04 +FROM ubuntu:20.04 RUN apt-get update RUN apt-get -y upgrade -RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng16-16 libzip5 libcurl4 libfreetype6 libfontconfig1 libicu63 +RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng16-16 libzip5 libcurl4 libfreetype6 libfontconfig1 libicu66 # Install OpenRCT2 COPY --from=build-env /openrct2-install /openrct2-install |