diff options
| -rw-r--r-- | 0.2.5/cli/Dockerfile | 13 | ||||
| -rw-r--r-- | develop/cli/Dockerfile | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/0.2.5/cli/Dockerfile b/0.2.5/cli/Dockerfile index d67a7ab..1bd6958 100644 --- a/0.2.5/cli/Dockerfile +++ b/0.2.5/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 v0.2.5 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 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 |