Update 4 files

- /Dockerfile
- /Dockerfile-linux
- /.gitlab-ci.yml
- /Dockerfile-windows
This commit is contained in:
niansa 2024-03-10 13:03:14 +00:00
parent 489ea7c9ba
commit c7954d3a80
3 changed files with 22 additions and 3 deletions

View file

@ -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
- 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

9
Dockerfile-windows Normal file
View file

@ -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