diff options
| author | Michał Janiszewski <[email protected]> | 2024-04-12 12:44:08 +0200 |
|---|---|---|
| committer | Michał Janiszewski <[email protected]> | 2024-04-12 12:52:17 +0200 |
| commit | 0f0a6051c9bed5f5bc9f0c22ead0c8aeaef6bd07 (patch) | |
| tree | 30e12112c630fd559554d6c68e71817f8f6d0c6f /develop/cli | |
| parent | f44301964e15589f447f73b6f9945f5880d9bf29 (diff) | |
| download | openrct2-docker-0f0a6051c9bed5f5bc9f0c22ead0c8aeaef6bd07.tar.gz openrct2-docker-0f0a6051c9bed5f5bc9f0c22ead0c8aeaef6bd07.zip | |
Update develop image from Focal to Jammy for C++20
Diffstat (limited to 'develop/cli')
| -rw-r--r-- | develop/cli/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/develop/cli/Dockerfile b/develop/cli/Dockerfile index 4fbf0b7..ac10b29 100644 --- a/develop/cli/Dockerfile +++ b/develop/cli/Dockerfile @@ -1,11 +1,11 @@ # Build OpenRCT2 -FROM ubuntu:20.04 AS build-env +FROM ubuntu:22.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-10 nlohmann-json3-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev libssl-dev libicu-dev libflac-dev libvorbis-dev \ + && apt-get install --no-install-recommends -y git cmake pkg-config ninja-build clang-14 nlohmann-json3-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev libssl-dev libicu-dev libflac-dev libvorbis-dev \ && rm -rf /var/lib/apt/lists/* \ - && ln -s /usr/bin/clang-10 /usr/bin/clang \ - && ln -s /usr/bin/clang++-10 /usr/bin/clang++ + && ln -s /usr/bin/clang-14 /usr/bin/clang \ + && ln -s /usr/bin/clang++-14 /usr/bin/clang++ ARG OPENRCT2_REF=develop WORKDIR /openrct2 @@ -20,11 +20,11 @@ RUN git -c http.sslVerify=false clone --depth 1 -b $OPENRCT2_REF https://github. && rm -rf /openrct2-install/usr/share/openrct2-cli # Build runtime image -FROM ubuntu:20.04 +FROM ubuntu:22.04 # Install OpenRCT2 COPY --from=build-env /openrct2-install /openrct2-install RUN apt-get update \ - && apt-get install --no-install-recommends -y rsync ca-certificates libpng16-16 libzip5 libcurl4 libfreetype6 libfontconfig1 libicu66 \ + && apt-get install --no-install-recommends -y rsync ca-certificates libpng16-16 libzip4 libcurl4 libfreetype6 libfontconfig1 libicu70 \ && rm -rf /var/lib/apt/lists/* \ && rsync -a /openrct2-install/* / \ && rm -rf /openrct2-install \ |