merge dev into main

.github/workflows/build_images.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Store Docker Images on /mnt/docker
         run: |
           sudo ./config_docker.py
-      - name: Show Docker Images
+      - name: Show Docker Images Before Building
         run: |
           docker images
       - name: Build Docker Images
@@ -42,7 +42,7 @@ jobs:
             --branch '${{ github.event.inputs.branch }}' \
             --repo '${{ github.event.inputs.repo }}' \
             --root-image-name '${{ github.event.inputs.root_image_name }}'
-      - name: Show Building Graph
+      - name: Show Building Graph After Building
         run: |
           cat graph.yaml
       - name: Show Docker Images

.github/workflows/build_images_regular.yml

@@ -4,29 +4,39 @@ on:
     - cron: '0 9 13 * *'
 jobs:
   build_docker_images_regularly:
-    runs-on: [self-hosted]
+    runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           ref: refs/heads/main
-      - name: Free Disk Space
-        run: |
-          ./free_disk_space.sh
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build Docker Images Regularly
+      - name: Install uv
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sudo env UV_INSTALL_DIR="/usr/local/bin" sh
+          which uv
+      - name: Store Docker Images on /mnt/docker
+        run: |
+          sudo ./config_docker.py
+      - name: Show Docker Images Before Building
+        run: |
+          docker images
+      - name: Build Docker Images
+        run: |
+          ./build_images.py --branch "" --repo "" --root-image-name ""
+      - name: Show Building Graph
         run: |
-          df -lh
-          ./build_images.py --branch "" --repo "" --root-image-name "" --remove-images
           cat graph.yaml
-          df -lh
+      - name: Show Docker Images After Building
+        run: |
+          docker images
       - name: Set Environment Variable
         run: echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
       - uses: "marvinpinto/action-automatic-releases@latest"

.github/workflows/create_pull_request.yml

@@ -7,7 +7,7 @@ jobs:
   create_pull_request:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           ref: main
       - name: Reset main branch with dev changes

build_images.py

@@ -32,12 +32,10 @@
 BRANCH_URLS = {
     "main": REPOS,
     "dev": REPOS,
+    #"26.04": REPOS,
     "rust_nightly": {
         # "https://github.com/legendu-net/docker-rust-utils": "",
     },
-    "4.0": {
-        "https://github.com/legendu-net/docker-jupyterhub": "",
-    },
 }