upgrade image

corpusops · Oct 15, 2024 · 9b0b1e0 · 9b0b1e0
1 parent c87f6fe
commit 9b0b1e0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-FROM ${_cops_BASE}:${_cops_VERSION}
+FROM ${_cops_BASE}:${_cops_VERSION} AS final
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM ${_cops_BASE}:${_cops_VERSION}
		FROM ${_cops_BASE}:${_cops_VERSION} AS final