From 04a85d607c5cac24ed2b94db58a9811b51b3a3f7 Mon Sep 17 00:00:00 2001 From: Mathieu Le Marec - Pasquet Date: Fri, 26 Dec 2025 16:05:19 +0200 Subject: [PATCH] upgrade image --- .github/workflows/cicd.yml | 4 ++-- .github/workflows/cicd.yml.in | 4 ++-- Dockerfile.from | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 025caa0..ddf30eb 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -16,7 +16,7 @@ env: DOCKER_PASSWORD: "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}" jobs: r: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 env: {IMAGES: "${{matrix.IMAGES}}"} steps: - name: Set vars @@ -34,7 +34,7 @@ jobs: password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Activate docker experimental run: |- - sudo bash -exc "service docker stop;python -c \ + sudo bash -exc "if [ ! -e /etc/docker/daemon.json ];then mkdir /etc/docker||true;echo '{}' > /etc/docker/daemon.json;fi;service docker stop;python -c \ \"d='/etc/docker/daemon.json';\ import json;c=json.load(open(d));c['experimental']=True;\ open(d, 'w').write(json.dumps(c))\" diff --git a/.github/workflows/cicd.yml.in b/.github/workflows/cicd.yml.in index 103a307..61a6f83 100644 --- a/.github/workflows/cicd.yml.in +++ b/.github/workflows/cicd.yml.in @@ -16,7 +16,7 @@ env: DOCKER_PASSWORD: "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}" jobs: r: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 env: {IMAGES: "${{matrix.IMAGES}}"} steps: - name: Set vars @@ -34,7 +34,7 @@ jobs: password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Activate docker experimental run: |- - sudo bash -exc "service docker stop;python -c \ + sudo bash -exc "if [ ! -e /etc/docker/daemon.json ];then mkdir /etc/docker||true;echo '{}' > /etc/docker/daemon.json;fi;service docker stop;python -c \ \"d='/etc/docker/daemon.json';\ import json;c=json.load(open(d));c['experimental']=True;\ open(d, 'w').write(json.dumps(c))\" diff --git a/Dockerfile.from b/Dockerfile.from index b411193..64655ad 100644 --- a/Dockerfile.from +++ b/Dockerfile.from @@ -1 +1 @@ -FROM ${_cops_BASE}:${_cops_VERSION} +FROM ${_cops_BASE}:${_cops_VERSION} AS final