diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-16 21:57:27 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-19 14:18:35 +0000 |
| commit | 60a18f09fa547af064fb851e72b816ee25bf71a3 (patch) | |
| tree | 3f35003c863286a9fbced3d991ce060b7630a0c6 | |
| parent | 5b5a4bd03f5e80b038d55f70203589dd3d11ac90 (diff) | |
docker: update qt4 image to Jammy
Change-Id: Ic81ffb3a65ceb0e373b9bc2981ccd6f6b67b5df1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 8 | ||||
| -rw-r--r-- | docker/jammy/test-qt4.Dockerfile (renamed from docker/focal/test-qt4.Dockerfile) | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc6801e9f..6ccd36047 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -422,7 +422,7 @@ jobs: } - { name: 'Run Linux tests (Qt 4.8.7)', - image: 'focal-qt4', + image: 'jammy-qt4', suffix: 'linux', profile: '', script: './scripts/test-qt4.sh', diff --git a/docker-compose.yml b/docker-compose.yml index 4ccd7a58a..27d334647 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -136,12 +136,12 @@ services: dockerfile: docker/jammy/test-baremetal.Dockerfile context: . - focal-qt4: + jammy-qt4: << : *linux - hostname: focal-qt4 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt4-1 + hostname: jammy-qt4 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-qt4-0 build: - dockerfile: docker/focal/test-qt4.Dockerfile + dockerfile: docker/jammy/test-qt4.Dockerfile context: . leap: diff --git a/docker/focal/test-qt4.Dockerfile b/docker/jammy/test-qt4.Dockerfile index e49e255f9..9fa8f5d6b 100644 --- a/docker/focal/test-qt4.Dockerfile +++ b/docker/jammy/test-qt4.Dockerfile @@ -1,7 +1,7 @@ # # Testing Qbs with qt4 # -FROM ubuntu:focal +FROM ubuntu:jammy LABEL Description="Ubuntu qt4 test environment for Qbs" # Allow colored output on command line. @@ -28,11 +28,11 @@ RUN apt-get update -qq && \ usermod -a -G sudo ${USER_NAME} && \ echo "%devel ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers -COPY docker/focal/entrypoint.sh /sbin/entrypoint.sh +COPY docker/entrypoint.sh /sbin/entrypoint.sh ENTRYPOINT ["/sbin/entrypoint.sh"] # Install baremetal toolchains and Qbs runtime dependencies. -RUN sudo add-apt-repository ppa:gezakovacs/ppa -y && \ +RUN sudo add-apt-repository ppa:ubuntuhandbook1/ppa -y && \ apt-get update -qq && \ apt-get install -qq -y \ build-essential \ |