diff options
| author | Ted John <[email protected]> | 2019-05-01 23:59:10 +0000 |
|---|---|---|
| committer | Ted John <[email protected]> | 2019-05-02 00:00:16 +0000 |
| commit | 1bcb98d8df6417438d7d9cd7a68d2a80e9442e31 (patch) | |
| tree | d9e8c7467bc694f6ef3ce4b1418d09d986888079 | |
| parent | 36ddd9b110ad1918d98cda26cbb8f8018d80af28 (diff) | |
| download | openrct2-docker-1bcb98d8df6417438d7d9cd7a68d2a80e9442e31.tar.gz openrct2-docker-1bcb98d8df6417438d7d9cd7a68d2a80e9442e31.zip | |
Add 0.2.2 image and update develop to Ubuntu 19.04
| -rw-r--r-- | 0.2.2/cli/Dockerfile | 39 | ||||
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | develop/cli/Dockerfile | 12 |
3 files changed, 48 insertions, 8 deletions
diff --git a/0.2.2/cli/Dockerfile b/0.2.2/cli/Dockerfile new file mode 100644 index 0000000..41d1463 --- /dev/null +++ b/0.2.2/cli/Dockerfile @@ -0,0 +1,39 @@ +# Build OpenRCT2 +FROM ubuntu:18.04 AS build-env +RUN apt-get update \ + && apt-get install --no-install-recommends -y git cmake pkg-config ninja-build clang-5.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-5.0 /usr/bin/clang \ + && ln -s /usr/bin/clang++-5.0 /usr/bin/clang++ + +ENV OPENRCT2_REF v0.2.2 +WORKDIR /openrct2 +RUN git -c http.sslVerify=false clone --depth 1 -b $OPENRCT2_REF https://github.com/OpenRCT2/OpenRCT2 . \ + && mkdir build \ + && cd build \ + && cmake .. -G Ninja -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/openrct2-install/usr -DCMAKE_INSTALL_LIBDIR=/openrct2-install/usr/lib \ + && ninja -k0 install + +# Build runtime image +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 libpng16-16 libzip4 libcurl4 libfreetype6 libfontconfig1 libicu60 + +# Install OpenRCT2 +COPY --from=build-env /openrct2-install /openrct2-install +RUN rsync -a /openrct2-install/* / \ + && rm -rf /openrct2-install \ + && openrct2-cli --version + +# Set up ordinary user +RUN useradd -m openrct2 +USER openrct2 +WORKDIR /home/openrct2 +EXPOSE 11753 + +# Test run and scan +RUN openrct2-cli --version \ + && openrct2-cli scan-objects + +# Done +ENTRYPOINT ["openrct2-cli"] @@ -29,9 +29,10 @@ It will then host a new server and load the saved game `mypark.sv6` located in t ## Tags -Currently all tags are based on Ubuntu 18.04 (amd64). +Develop is now based on Ubuntu 19.04 (amd64). All other tags are based on Ubuntu 18.04 (amd64). - [`develop` (*develop/cli/Dockerfile*)](https://github.com/OpenRCT2/openrct2-docker/blob/master/develop/cli/Dockerfile) -- [`0.2.1`, `latest` (*0.2.1/cli/Dockerfile*)](https://github.com/OpenRCT2/openrct2-docker/blob/master/0.2.1/cli/Dockerfile) +- [`0.2.2`, `latest` (*0.2.2/cli/Dockerfile*)](https://github.com/OpenRCT2/openrct2-docker/blob/master/0.2.2/cli/Dockerfile) +- [`0.2.1` (*0.2.1/cli/Dockerfile*)](https://github.com/OpenRCT2/openrct2-docker/blob/master/0.2.1/cli/Dockerfile) - [`0.2.0` (*0.2.0/cli/Dockerfile*)](https://github.com/OpenRCT2/openrct2-docker/blob/master/0.2.0/cli/Dockerfile) - [`0.1.2` (*0.1.2/cli/Dockerfile*)](https://github.com/OpenRCT2/openrct2-docker/blob/master/0.1.2/cli/Dockerfile) diff --git a/develop/cli/Dockerfile b/develop/cli/Dockerfile index f720fa2..9eb063f 100644 --- a/develop/cli/Dockerfile +++ b/develop/cli/Dockerfile @@ -1,9 +1,9 @@ # Build OpenRCT2 -FROM ubuntu:18.04 AS build-env +FROM ubuntu:19.04 AS build-env RUN apt-get update \ - && apt-get install --no-install-recommends -y git cmake pkg-config ninja-build clang-5.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-5.0 /usr/bin/clang \ - && ln -s /usr/bin/clang++-5.0 /usr/bin/clang++ + && 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++ ENV OPENRCT2_REF develop WORKDIR /openrct2 @@ -14,10 +14,10 @@ RUN git -c http.sslVerify=false clone --depth 1 -b $OPENRCT2_REF https://github. && ninja -k0 install # Build runtime image -FROM ubuntu:18.04 +FROM ubuntu:19.04 RUN apt-get update RUN apt-get -y upgrade -RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng16-16 libzip4 libcurl4 libfreetype6 libfontconfig1 libicu60 +RUN apt-get install --no-install-recommends -y rsync ca-certificates libjansson4 libpng16-16 libzip5 libcurl4 libfreetype6 libfontconfig1 libicu63 # Install OpenRCT2 COPY --from=build-env /openrct2-install /openrct2-install |