test

Dockershelf · Mar 10, 2024 · d4139af · d4139af
1 parent 1e1f598
commit d4139af
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 43 deletions.
diff --git a/.github/workflows/trigger-develop.yml b/.github/workflows/trigger-develop.yml
@@ -11,33 +11,33 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - docker-image-name: "dockershelf/debian:bullseye"
-            docker-image-extra-tags: "dockershelf/debian:oldstable"
-            debian-suite: "oldstable"
-          - docker-image-name: "dockershelf/debian:bookworm"
-            docker-image-extra-tags: "dockershelf/debian:stable"
-            debian-suite: "stable"
-          - docker-image-name: "dockershelf/debian:trixie"
-            docker-image-extra-tags: "dockershelf/debian:testing"
-            debian-suite: "testing"
-          - docker-image-name: "dockershelf/debian:sid"
-            docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
-            debian-suite: "unstable"
-          - docker-image-name: "dockershelf/latex:basic"
-            docker-image-extra-tags: "dockershelf/latex:latest"
-          - docker-image-name: "dockershelf/latex:full"
-          - docker-image-name: "dockershelf/python:3.7-bookworm"
-            docker-image-extra-tags: "dockershelf/python:3.7-stable"
-          - docker-image-name: "dockershelf/python:3.7-sid"
-            docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7"
-          - docker-image-name: "dockershelf/python:3.11-bookworm"
-            docker-image-extra-tags: "dockershelf/python:3.11-stable"
-          - docker-image-name: "dockershelf/python:3.11-sid"
-            docker-image-extra-tags: "dockershelf/python:3.11-unstable dockershelf/python:3.11"
-          - docker-image-name: "dockershelf/python:3.12-bookworm"
-            docker-image-extra-tags: "dockershelf/python:3.12-stable dockershelf/python:3-stable dockershelf/python:3-bookworm dockershelf/python:latest-stable dockershelf/python:latest-bookworm"
-          - docker-image-name: "dockershelf/python:3.12-sid"
-            docker-image-extra-tags: "dockershelf/python:3.12-unstable dockershelf/python:3.12 dockershelf/python:3-unstable dockershelf/python:3-sid dockershelf/python:3 dockershelf/python:latest-unstable dockershelf/python:latest-sid dockershelf/python:latest"
+          # - docker-image-name: "dockershelf/debian:bullseye"
+          #   docker-image-extra-tags: "dockershelf/debian:oldstable"
+          #   debian-suite: "oldstable"
+          # - docker-image-name: "dockershelf/debian:bookworm"
+          #   docker-image-extra-tags: "dockershelf/debian:stable"
+          #   debian-suite: "stable"
+          # - docker-image-name: "dockershelf/debian:trixie"
+          #   docker-image-extra-tags: "dockershelf/debian:testing"
+          #   debian-suite: "testing"
+          # - docker-image-name: "dockershelf/debian:sid"
+          #   docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
+          #   debian-suite: "unstable"
+          # - docker-image-name: "dockershelf/latex:basic"
+          #   docker-image-extra-tags: "dockershelf/latex:latest"
+          # - docker-image-name: "dockershelf/latex:full"
+          # - docker-image-name: "dockershelf/python:3.7-bookworm"
+          #   docker-image-extra-tags: "dockershelf/python:3.7-stable"
+          # - docker-image-name: "dockershelf/python:3.7-sid"
+          #   docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7"
+          # - docker-image-name: "dockershelf/python:3.11-bookworm"
+          #   docker-image-extra-tags: "dockershelf/python:3.11-stable"
+          # - docker-image-name: "dockershelf/python:3.11-sid"
+          #   docker-image-extra-tags: "dockershelf/python:3.11-unstable dockershelf/python:3.11"
+          # - docker-image-name: "dockershelf/python:3.12-bookworm"
+          #   docker-image-extra-tags: "dockershelf/python:3.12-stable dockershelf/python:3-stable dockershelf/python:3-bookworm dockershelf/python:latest-stable dockershelf/python:latest-bookworm"
+          # - docker-image-name: "dockershelf/python:3.12-sid"
+          #   docker-image-extra-tags: "dockershelf/python:3.12-unstable dockershelf/python:3.12 dockershelf/python:3-unstable dockershelf/python:3-sid dockershelf/python:3 dockershelf/python:latest-unstable dockershelf/python:latest-sid dockershelf/python:latest"
           - docker-image-name: "dockershelf/node:12-bookworm"
             docker-image-extra-tags: "dockershelf/node:12-stable"
           - docker-image-name: "dockershelf/node:12-sid"
@@ -58,22 +58,22 @@ jobs:
             docker-image-extra-tags: "dockershelf/node:20-stable dockershelf/node:latest-stable dockershelf/node:latest-bookworm"
           - docker-image-name: "dockershelf/node:20-sid"
             docker-image-extra-tags: "dockershelf/node:20-unstable dockershelf/node:20 dockershelf/node:latest-unstable dockershelf/node:latest-sid dockershelf/node:latest"
-          - docker-image-name: "dockershelf/go:1.19-bookworm"
-            docker-image-extra-tags: "dockershelf/go:1.19-stable"
-          - docker-image-name: "dockershelf/go:1.19-sid"
-            docker-image-extra-tags: "dockershelf/go:1.19-unstable dockershelf/go:1.19"
-          - docker-image-name: "dockershelf/go:1.20-bookworm"
-            docker-image-extra-tags: "dockershelf/go:1.20-stable"
-          - docker-image-name: "dockershelf/go:1.20-sid"
-            docker-image-extra-tags: "dockershelf/go:1.20-unstable dockershelf/go:1.20"
-          - docker-image-name: "dockershelf/go:1.21-bookworm"
-            docker-image-extra-tags: "dockershelf/go:1.21-stable"
-          - docker-image-name: "dockershelf/go:1.21-sid"
-            docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21"
-          - docker-image-name: "dockershelf/go:1.22-bookworm"
-            docker-image-extra-tags: "dockershelf/go:1.22-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
-          - docker-image-name: "dockershelf/go:1.22-sid"
-            docker-image-extra-tags: "dockershelf/go:1.22-unstable dockershelf/go:1.22 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"
+          # - docker-image-name: "dockershelf/go:1.19-bookworm"
+          #   docker-image-extra-tags: "dockershelf/go:1.19-stable"
+          # - docker-image-name: "dockershelf/go:1.19-sid"
+          #   docker-image-extra-tags: "dockershelf/go:1.19-unstable dockershelf/go:1.19"
+          # - docker-image-name: "dockershelf/go:1.20-bookworm"
+          #   docker-image-extra-tags: "dockershelf/go:1.20-stable"
+          # - docker-image-name: "dockershelf/go:1.20-sid"
+          #   docker-image-extra-tags: "dockershelf/go:1.20-unstable dockershelf/go:1.20"
+          # - docker-image-name: "dockershelf/go:1.21-bookworm"
+          #   docker-image-extra-tags: "dockershelf/go:1.21-stable"
+          # - docker-image-name: "dockershelf/go:1.21-sid"
+          #   docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21"
+          # - docker-image-name: "dockershelf/go:1.22-bookworm"
+          #   docker-image-extra-tags: "dockershelf/go:1.22-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
+          # - docker-image-name: "dockershelf/go:1.22-sid"
+          #   docker-image-extra-tags: "dockershelf/go:1.22-unstable dockershelf/go:1.22 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"
 
     steps:
       - name: Checkout repo

diff --git a/node/build-image.sh b/node/build-image.sh
@@ -82,6 +82,10 @@ for PKG in ${NODE_PKGS}; do
     NODE_PKGS_VER="${NODE_PKGS_VER} ${PKG}=${PKG_VER}"
 done
 
+if [ "${DEBIAN_RELEASE}" == "sid" ]; then
+    cmdretry aptitude install libdb5.3t64 libreadline8t64
+fi
+
 cmdretry aptitude install ${NODE_PKGS_VER}
 
 if [ ! -f "/usr/bin/nodejs" ]; then