From c6c0551436fce002dd5b8361df7aa2e6b9c93b3d Mon Sep 17 00:00:00 2001 From: Stefan Hausotte Date: Fri, 29 Mar 2024 23:45:18 +0100 Subject: [PATCH 1/2] update to Ubuntu 24.04 --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c2058318..3304108e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ on: jobs: test-kellnr: name: Kellnr Test x64 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout @@ -34,7 +34,7 @@ jobs: build-kellnr: name: Kellnr Build if: github.event_name == 'release' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: target: @@ -101,7 +101,7 @@ jobs: deploy-kellnr: name: Kellnr Deploy if: github.event_name == 'release' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - test-kellnr - build-kellnr @@ -147,7 +147,7 @@ jobs: deploy-container: name: Deploy Container Image X-Plat if: github.event_name == 'release' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - deploy-kellnr permissions: From 1b9fe864828475f471b722daf6f127d1c669a109 Mon Sep 17 00:00:00 2001 From: Stefan Hausotte Date: Fri, 29 Mar 2024 23:52:33 +0100 Subject: [PATCH 2/2] revert to ubuntu 22.04 as 24.04 is not released yet --- .github/workflows/ci.yaml | 8 ++++---- docker/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3304108e..c2058318 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ on: jobs: test-kellnr: name: Kellnr Test x64 - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Checkout @@ -34,7 +34,7 @@ jobs: build-kellnr: name: Kellnr Build if: github.event_name == 'release' - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 strategy: matrix: target: @@ -101,7 +101,7 @@ jobs: deploy-kellnr: name: Kellnr Deploy if: github.event_name == 'release' - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 needs: - test-kellnr - build-kellnr @@ -147,7 +147,7 @@ jobs: deploy-container: name: Deploy Container Image X-Plat if: github.event_name == 'release' - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 needs: - deploy-kellnr permissions: diff --git a/docker/Dockerfile b/docker/Dockerfile index c067e436..18cd3813 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 +FROM ubuntu:22.04 ARG ADMINPWD=admin ENV INSTALLDIR=/opt