From c7954d3a80a07b4f03fca2e80d7b1d1c9cfdc6f7 Mon Sep 17 00:00:00 2001 From: niansa Date: Sun, 10 Mar 2024 13:03:14 +0000 Subject: [PATCH] Update 4 files - /Dockerfile - /Dockerfile-linux - /.gitlab-ci.yml - /Dockerfile-windows --- .gitlab-ci.yml | 16 +++++++++++++--- Dockerfile => Dockerfile-linux | 0 Dockerfile-windows | 9 +++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) rename Dockerfile => Dockerfile-linux (100%) create mode 100644 Dockerfile-windows diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e280532..0e9e761 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,22 @@ stages: - build -build docker image: +build linux x64: stage: build image: docker services: - docker:dind script: - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin - - docker build -t $CI_REGISTRY_IMAGE . - - docker push $CI_REGISTRY_IMAGE \ No newline at end of file + - docker build -f Dockerfile-linux -t ${CI_REGISTRY_IMAGE}:linux-x86 . + - docker push ${CI_REGISTRY_IMAGE}:linux-x86 + +build windows x64: + stage: build + image: docker + services: + - docker:dind + script: + - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin + - docker build -f Dockerfile-windows -t ${CI_REGISTRY_IMAGE}:linux-x86 . + - docker push ${CI_REGISTRY_IMAGE}:linux-x86 diff --git a/Dockerfile b/Dockerfile-linux similarity index 100% rename from Dockerfile rename to Dockerfile-linux diff --git a/Dockerfile-windows b/Dockerfile-windows new file mode 100644 index 0000000..396776f --- /dev/null +++ b/Dockerfile-windows @@ -0,0 +1,9 @@ +FROM debian:trixie +RUN apt-get update --yes \ + && sudo dpkg --add-architecture i386 \ + && sudo mkdir -pm755 /etc/apt/keyrings \ + && sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key \ + && sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/trixie/winehq-trixie.sources \ + && sudo apt-get update \ + && sudo apt-get install winehq-stable \ + && apt-get clean