Skip to content

Commit

Permalink
Update develop image from Focal to Jammy for C++20
Browse files Browse the repository at this point in the history
  • Loading branch information
janisozaur committed Apr 12, 2024
1 parent f443019 commit 0f0a605
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions develop/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down

0 comments on commit 0f0a605

Please sign in to comment.