From 2a57ed991616f9a3cc2c8c68399659522f43cde3 Mon Sep 17 00:00:00 2001 From: icex2 Date: Sun, 26 Mar 2023 23:57:26 +0200 Subject: [PATCH] fix(dev): Upgrade docker file, move to latest debian bullseye base image The fedora image was already quite old but also took ages to initially install the dependencies. Being more familiar with debian, initial container building with package installation being rather quick, and assuming most folks being more familiar debian as well, I decided to shift to make this easier to maintain. --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8892c97..8f88f6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,21 @@ -FROM --platform=amd64 fedora:31@sha256:cbe53d28f54c0f0b1d79a1817089235680b104c23619772473f449f20edd37dd +FROM --platform=amd64 debian:11.6-slim@sha256:f7d141c1ec6af549958a7a2543365a7829c2cdc4476308ec2e182f8a7c59b519 LABEL description="Build environment for bemanitools" -RUN yum -y install \ - git \ +# mingw-w64-gcc has 32-bit and 64-bit toolchains +RUN apt-get update && apt-get install -y --no-install-recommends \ + mingw-w64 \ + mingw-w64-common \ make \ zip \ - clang \ - mingw64-gcc.x86_64 \ - mingw32-gcc.x86_64 + git \ + && rm -rf /var/lib/apt/lists/* RUN mkdir /bemanitools WORKDIR /bemanitools ENTRYPOINT [ \ - "/bin/bash", \ + "/bin/sh", \ "-c" , \ "cd /bemanitools && \ make" ] \ No newline at end of file