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 1141fe5..156fdfe 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,31 @@ 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 \ + make \ + 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 \ - && apt purge -y wget \ + && 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 \ + && 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 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.buildwin64 b/Dockerfile.buildwin64 index c4b5960..bc87811 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,12 +12,34 @@ 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 \ + make \ + 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 \ + && 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 \ + make \ && apt-get autoremove -y && apt-get clean \ && rm -rf /var/lib/apt/lists/*