pull or ok

.gitea/workflows/cicd.yaml

@@ -3,6 +3,8 @@ on:
   push:
     branches:
     - main
+  schedule:
+  - cron: '2 2 * * 0'
 
 jobs:
   pull:
@@ -11,32 +13,21 @@ jobs:
     steps:
     - name: pull
       run: |
-        was=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
+        docker pull registry-app.inhome.blapointe.com:5001/bel/dind:latest || true
-        docker pull registry-app.inhome.blapointe.com:5001/docker:latest
-        new=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
-        if [ "$was" != "$new" ]; then
-          docker rmi "$was"
-        fi
       shell: sh
   cicd:
     name: cicd
     runs-on: dind
     steps:
+    - name: checkout
+      uses: actions/checkout@v3
     - name: cicd
       run: |
-        was=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
+        pwd
-
+        ls
-        env
+        find . -type d
-
+        ps aux www
-        echo clone ${{ gitea.repository }}
+        which git
-        git clone ${{ gitea.repository }}
-        cd ./*/
         if ! sh ./build.sh; then
           exit 1
         fi
-
-        new=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
-        if [ "$was" != "$new" ]; then
-          docker rmi "$was"
-        fi
-      shell: sh

Dockerfile

@@ -1,7 +1,3 @@
 FROM docker:24.0.7-dind-alpine3.18
 
-RUN apk update && apk --no-cache add bash curl git
+RUN apk update && apk --no-cache add bash curl git nodejs npm jq
-
-COPY ./entrypoint.sh /bin/entrypoint.sh
-RUN chmod +x /bin/entrypoint.sh
-ENTRYPOINT ["/bin/entrypoint.sh"]

build.sh

@@ -1,10 +1,19 @@
 #! /bin/sh
 
-img=registry-app.inhome.blapointe.com:5001/docker
+img=registry-app.inhome.blapointe.com:5001/bel/dind
 t=latest
-docker rmi $img:$t
 
 set -e
 
-docker build -f ./Dockerfile -t $img:$t --progress plain .
+get_sha() {
+   docker inspect $img:$t | grep '"Id"' | awk '{print $NF}' | sed 's/^"sha256://' | sed 's/",$//'
+}
+
+was=$(get_sha)
+docker build -f ./Dockerfile -t $img:$t .
 docker push $img:$t
+now=$(get_sha)
+if [ -n "$was" ] && [ "$was" != "$now" ]; then
+   echo pruning old $was
+   docker rmi "$was" || true
+fi