Commit 5799e89f authored by Alexandre Julliard's avatar Alexandre Julliard

gitlab: Upgrade the Debian image to bookworm.

parent 1591e01e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.wine-build: .wine-build:
stage: build stage: build
image: $CI_REGISTRY/wine/wine:debian-bullseye image: $CI_REGISTRY/wine/wine:debian-bookworm
interruptible: true interruptible: true
variables: variables:
GIT_DEPTH: 0 GIT_DEPTH: 0
...@@ -64,7 +64,7 @@ build-daily-linux: ...@@ -64,7 +64,7 @@ build-daily-linux:
build-winetest: build-winetest:
stage: build stage: build
image: $CI_REGISTRY/wine/wine:debian-bullseye image: $CI_REGISTRY/wine/wine:debian-bookworm
rules: rules:
- if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
needs: needs:
......
...@@ -23,13 +23,12 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ ...@@ -23,13 +23,12 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \
libgnutls28-dev:amd64 libgnutls28-dev:i386 \ libgnutls28-dev:amd64 libgnutls28-dev:i386 \
libgphoto2-dev:amd64 libgphoto2-dev:i386 \ libgphoto2-dev:amd64 libgphoto2-dev:i386 \
libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \ libgstreamer-plugins-base1.0-dev:i386 \
libice-dev:amd64 libice-dev:i386 \ libice-dev:amd64 libice-dev:i386 \
libkrb5-dev:amd64 libkrb5-dev:i386 \ libkrb5-dev:amd64 libkrb5-dev:i386 \
libldap-dev:amd64 libldap-dev:i386 \
libopenal-dev:amd64 libopenal-dev:i386 \
libosmesa6-dev:amd64 libosmesa6-dev:i386 \ libosmesa6-dev:amd64 libosmesa6-dev:i386 \
libpcap-dev:amd64 libpcap-dev:i386 \ libpcap-dev:amd64 libpcap-dev:i386 \
libpcsclite-dev:amd64 \
libpulse-dev:amd64 libpulse-dev:i386 \ libpulse-dev:amd64 libpulse-dev:i386 \
libsane-dev:amd64 libsane-dev:i386 \ libsane-dev:amd64 libsane-dev:i386 \
libsdl2-dev:amd64 libsdl2-dev:i386 \ libsdl2-dev:amd64 libsdl2-dev:i386 \
......
...@@ -11,8 +11,8 @@ build-image: ...@@ -11,8 +11,8 @@ build-image:
name: gcr.io/kaniko-project/executor:debug name: gcr.io/kaniko-project/executor:debug
entrypoint: [""] entrypoint: [""]
variables: variables:
IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bullseye" IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bookworm"
IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bullseye" IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bookworm"
DOCKER_FILE: "$CI_PROJECT_DIR/tools/gitlab/image.docker" DOCKER_FILE: "$CI_PROJECT_DIR/tools/gitlab/image.docker"
script: script:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.wine-test: .wine-test:
stage: test stage: test
image: $CI_REGISTRY/wine/wine:debian-bullseye image: $CI_REGISTRY/wine/wine:debian-bookworm
interruptible: true interruptible: true
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment