From 7e54f90101129ce6e3171b9255e2cc73bff62738 Mon Sep 17 00:00:00 2001 From: Bartek thindil Jasicki Date: Wed, 6 May 2026 05:34:49 +0200 Subject: [PATCH 1/4] feat: updated Nim and added SDL2 --- Dockerfile.build | 17 +++++++++++++---- Dockerfile.buildwin64 | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 1141fe5..e1e04a9 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,6 +1,6 @@ FROM debian:12 ENV TZ=Europe/Berlin -ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/nim-2.2.6/bin +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/nim-2.2.10/bin RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && apt-get update && apt-get install -y \ git \ @@ -9,10 +9,19 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ xz-utils \ libpcre3 \ wget \ - && wget https://nim-lang.org/download/nim-2.2.6-linux_x64.tar.xz \ - && tar -xf nim-2.2.6-linux_x64.tar.xz \ - && rm nim-2.2.6-linux_x64.tar.xz \ + libsdl2-dev \ + libsdl2-image-dev \ + && wget https://nim-lang.org/download/nim-2.2.10-linux_x64.tar.xz \ + && tar -xf nim-2.2.10-linux_x64.tar.xz \ + && rm nim-2.2.10-linux_x64.tar.xz \ && nimble install -y unittest2 "nimalyzer@#head" contracts \ + && wget https://github.com/libsdl-org/SDL/releases/download/release-2.32.10/SDL2-2.32.10.tar.gz \ + && tar -xf SDL2-2.32.10.tar.gz \ + && cd SDL2-2.32.10 \ + && ./configure --prefix=/usr \ + && make \ + && make install \ + && rm SDL2-2.32.10.tar.gz \ && apt purge -y wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.buildwin64 b/Dockerfile.buildwin64 index c4b5960..82961f0 100644 --- a/Dockerfile.buildwin64 +++ b/Dockerfile.buildwin64 @@ -1,6 +1,6 @@ FROM debian:12 ENV TZ=Europe/Berlin -ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/nim-2.2.6/bin +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/nim-2.2.10/bin RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && apt-get update && apt-get install -y \ wget \ @@ -12,10 +12,19 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ gcc-mingw-w64-x86-64 \ libpcre3 \ xz-utils \ - && wget https://nim-lang.org/download/nim-2.2.6-linux_x64.tar.xz \ - && tar -xf nim-2.2.6-linux_x64.tar.xz \ - && rm nim-2.2.6-linux_x64.tar.xz \ + libsdl2-dev \ + libsdl2-image-dev \ + && wget https://nim-lang.org/download/nim-2.2.10-linux_x64.tar.xz \ + && tar -xf nim-2.2.10-linux_x64.tar.xz \ + && rm nim-2.2.10-linux_x64.tar.xz \ && nimble install -y "nimalyzer@#head" contracts \ + && wget https://github.com/libsdl-org/SDL/releases/download/release-2.32.10/SDL2-2.32.10.tar.gz \ + && tar -xf SDL2-2.32.10.tar.gz \ + && cd SDL2-2.32.10 \ + && ./configure --prefix=/usr \ + && make \ + && make install \ + && rm SDL2-2.32.10.tar.gz \ && apt-get purge -y \ wget \ unzip \ From 3274b4775dfb167b14eebfcefc8778069b69155b Mon Sep 17 00:00:00 2001 From: Bartek thindil Jasicki Date: Wed, 6 May 2026 05:39:48 +0200 Subject: [PATCH 2/4] feat: added make and updated default settings for GitHub actions --- .github/workflows/docker.yml | 6 +++--- Dockerfile.build | 5 ++++- Dockerfile.buildwin64 | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 17aa6b5..11b1ef6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,7 +6,7 @@ on: filename: description: Name of the Docker image configuration to build required: true - default: Dockerfile.gnat + default: Dockerfile.build username: description: Name of the Docker user required: true @@ -14,11 +14,11 @@ on: name: description: Name of the Docker image required: true - default: gnat + default: build version: description: Version of the Docker image required: true - default: 9 + default: 10 jobs: build: diff --git a/Dockerfile.build b/Dockerfile.build index e1e04a9..b8db89c 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -9,6 +9,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ xz-utils \ libpcre3 \ wget \ + make \ libsdl2-dev \ libsdl2-image-dev \ && wget https://nim-lang.org/download/nim-2.2.10-linux_x64.tar.xz \ @@ -22,6 +23,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && make \ && make install \ && rm SDL2-2.32.10.tar.gz \ - && apt purge -y wget \ + && apt-get purge -y \ + wget \ + make \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.buildwin64 b/Dockerfile.buildwin64 index 82961f0..474b3ad 100644 --- a/Dockerfile.buildwin64 +++ b/Dockerfile.buildwin64 @@ -12,6 +12,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ gcc-mingw-w64-x86-64 \ libpcre3 \ xz-utils \ + make \ libsdl2-dev \ libsdl2-image-dev \ && wget https://nim-lang.org/download/nim-2.2.10-linux_x64.tar.xz \ @@ -28,5 +29,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && apt-get purge -y \ wget \ unzip \ + make \ && apt-get autoremove -y && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 264b817a84e802af951f539e6390af0ba6bb18c2 Mon Sep 17 00:00:00 2001 From: Bartek thindil Jasicki Date: Wed, 6 May 2026 05:45:48 +0200 Subject: [PATCH 3/4] fix: added missing command --- Dockerfile.build | 1 + Dockerfile.buildwin64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile.build b/Dockerfile.build index b8db89c..cec9c30 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -22,6 +22,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && ./configure --prefix=/usr \ && make \ && make install \ + && cd .. \ && rm SDL2-2.32.10.tar.gz \ && apt-get purge -y \ wget \ diff --git a/Dockerfile.buildwin64 b/Dockerfile.buildwin64 index 474b3ad..71ef550 100644 --- a/Dockerfile.buildwin64 +++ b/Dockerfile.buildwin64 @@ -25,6 +25,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && ./configure --prefix=/usr \ && make \ && make install \ + && cd .. \ && rm SDL2-2.32.10.tar.gz \ && apt-get purge -y \ wget \ From 9a607b5124508d20b22a11ed606db5a5d7e3b844 Mon Sep 17 00:00:00 2001 From: Bartek thindil Jasicki Date: Sun, 10 May 2026 05:39:30 +0200 Subject: [PATCH 4/4] feat: added SDL_Image --- Dockerfile.build | 8 ++++++++ Dockerfile.buildwin64 | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/Dockerfile.build b/Dockerfile.build index cec9c30..156fdfe 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -24,6 +24,14 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && make install \ && cd .. \ && rm SDL2-2.32.10.tar.gz \ + && wget https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.12/SDL2_image-2.8.12.tar.gz \ + && tar -xf SDL2_image-2.8.12.tar.gz \ + && cd SDL2_image-2.8.12 \ + && ./configure --prefix=/usr \ + && make \ + && make install \ + && cd .. \ + && rm SDL2_image-2.8.12.tar.gz \ && apt-get purge -y \ wget \ make \ diff --git a/Dockerfile.buildwin64 b/Dockerfile.buildwin64 index 71ef550..bc87811 100644 --- a/Dockerfile.buildwin64 +++ b/Dockerfile.buildwin64 @@ -27,6 +27,16 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && make install \ && cd .. \ && rm SDL2-2.32.10.tar.gz \ + && rm -rf SDL2-2.32.10 \ + && wget https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.12/SDL2_image-2.8.12.tar.gz \ + && tar -xf SDL2_image-2.8.12.tar.gz \ + && cd SDL2_image-2.8.12 \ + && ./configure --prefix=/usr \ + && make \ + && make install \ + && cd .. \ + && rm SDL2_image-2.8.12.tar.gz \ + && rm -rf SDL2_image-2.8.12 \ && apt-get purge -y \ wget \ unzip \