Skip to content

Commit

Permalink
Merge pull request #12 from OpenLoco/ci-update
Browse files Browse the repository at this point in the history
Add new Dockerfiles for Ubuntu Jammy, Mantic, and Fedora 39 (MinGW)
  • Loading branch information
AaronVanGeffen authored Nov 7, 2023
2 parents 01fea9d + a13fe27 commit 6b1aa47
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
matrix:
# Remember if you commit this, newly built images will replace those tags.
# Prefer incrementing the version to unused one
tag: [6-bionic32, 6-mingw32, 6-focal32, 6-jammy32]
tag: [7-mingw32, 7-jammy32, 7-mantic32]
env:
dockertag: ${{ matrix.tag }}
REGISTRY: ghcr.io
Expand Down
22 changes: 22 additions & 0 deletions 7/jammy32/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM ubuntu:22.04

ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get install --no-install-recommends -y \
ca-certificates \
ccache \
clang \
cmake \
g++-multilib \
gcc-multilib \
git \
libgtest-dev:i386 \
libopenal-dev:i386 \
libpng-dev:i386 \
libsdl2-dev:i386 \
ninja-build \
pkg-config:i386 \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*
22 changes: 22 additions & 0 deletions 7/mantic32/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM ubuntu:23.10

ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get install --no-install-recommends -y \
ca-certificates \
ccache \
clang \
cmake \
g++-multilib \
gcc-multilib \
git \
libgtest-dev:i386 \
libopenal-dev:i386 \
libpng-dev:i386 \
libsdl2-dev:i386 \
ninja-build \
pkg-config:i386 \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*
4 changes: 4 additions & 0 deletions 7/mingw32/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM fedora:39
RUN dnf update -y && \
dnf install -y mingw32-gcc-c++ mingw32-SDL2 mingw32-SDL2-static ccache cmake git ninja-build dnf-plugins-core mingw32-yaml-cpp mingw32-libpng mingw32-openal-soft && \
dnf clean all --enablerepo=\*

0 comments on commit 6b1aa47

Please sign in to comment.