Merge branch 'release/3.2.0'

Dockershelf · Jul 31, 2023 · 66b983a · 66b983a
2 parents 219eb08 + df4b93c
commit 66b983a
Show file tree

Hide file tree

Showing 40 changed files with 522 additions and 337 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.1.0
+current_version = 3.2.0
 tag_name = {new_version}
 commit = True
 tag = True

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          ref: develop
+          ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -53,7 +53,7 @@ jobs:
     needs: build
     steps:
       - name: Approve
-        uses: hmarr/auto-approve-action@v3.1.0
+        uses: hmarr/auto-approve-action@v3.2.1
         with:
           github-token: "${{ github.actor == 'LuisAlejandro' && secrets.GITHUB_TOKEN || secrets.PERSONAL_ACCESS_TOKEN }}"
 

diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml
@@ -13,49 +13,45 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - docker-image-name: "dockershelf/debian:buster"
+          - docker-image-name: "dockershelf/debian:bullseye"
             docker-image-extra-tags: "dockershelf/debian:oldstable"
             debian-suite: "oldstable"
-          - docker-image-name: "dockershelf/debian:bullseye"
+          - docker-image-name: "dockershelf/debian:bookworm"
             docker-image-extra-tags: "dockershelf/debian:stable"
             debian-suite: "stable"
-          - docker-image-name: "dockershelf/debian:bookworm"
+          - 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"
             debian-suite: "unstable"
           - docker-image-name: "dockershelf/latex:basic"
           - docker-image-name: "dockershelf/latex:full"
-          - docker-image-name: "dockershelf/python:3.7-bullseye"
+          - 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.10-bullseye"
+          - docker-image-name: "dockershelf/python:3.10-bookworm"
             docker-image-extra-tags: "dockershelf/python:3.10-stable"
           - docker-image-name: "dockershelf/python:3.10-sid"
             docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10"
-          - docker-image-name: "dockershelf/python:3.11-bullseye"
+          - 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-bullseye"
-            docker-image-extra-tags: "dockershelf/python:3.12-stable"
-          - docker-image-name: "dockershelf/python:3.12-sid"
-            docker-image-extra-tags: "dockershelf/python:3.12-unstable dockershelf/python:3.12"
-          - docker-image-name: "dockershelf/node:12-bullseye"
+          - docker-image-name: "dockershelf/node:12-bookworm"
             docker-image-extra-tags: "dockershelf/node:12-stable"
           - docker-image-name: "dockershelf/node:12-sid"
             docker-image-extra-tags: "dockershelf/node:12-unstable dockershelf/node:12"
-          - docker-image-name: "dockershelf/node:14-bullseye"
+          - docker-image-name: "dockershelf/node:14-bookworm"
             docker-image-extra-tags: "dockershelf/node:14-stable"
           - docker-image-name: "dockershelf/node:14-sid"
             docker-image-extra-tags: "dockershelf/node:14-unstable dockershelf/node:14"
-          - docker-image-name: "dockershelf/node:16-bullseye"
+          - docker-image-name: "dockershelf/node:16-bookworm"
             docker-image-extra-tags: "dockershelf/node:16-stable"
           - docker-image-name: "dockershelf/node:16-sid"
             docker-image-extra-tags: "dockershelf/node:16-unstable dockershelf/node:16"
-          - docker-image-name: "dockershelf/node:18-bullseye"
+          - docker-image-name: "dockershelf/node:18-bookworm"
             docker-image-extra-tags: "dockershelf/node:18-stable"
           - docker-image-name: "dockershelf/node:18-sid"
             docker-image-extra-tags: "dockershelf/node:18-unstable dockershelf/node:18"
@@ -66,40 +62,32 @@ jobs:
         with:
           ref: develop
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Installing dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install debootstrap
           sudo gem install docker-api serverspec
       - name: Building docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DEBIAN_SUITE: ${{ matrix.debian-suite }}
+          DH_USERNAME: ${{ secrets.DH_USERNAME }}
+          DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          DOCKER_IMAGE_TARGET="${DOCKER_IMAGE_NAME##dockershelf/}"
-          sed -i -r 's|FROM\s*(.*?)|FROM \1-dev|g' "${DOCKER_IMAGE_TARGET/://}/Dockerfile"
-          sed -i -r 's|FROM scratch-dev|FROM scratch|g' "${DOCKER_IMAGE_TARGET/://}/Dockerfile"
-          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}"
+          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}" "${DH_USERNAME}" "${DH_PASSWORD}" "develop"
       - name: Testing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
         run: |
-          bash test-image.sh "${DOCKER_IMAGE_NAME}" "${DOCKER_IMAGE_EXTRA_TAGS}"
+          bash test-image.sh "${DOCKER_IMAGE_NAME}" "develop"
       - name: Pushing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
           DH_USERNAME: ${{ secrets.DH_USERNAME }}
           DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          docker tag ${DOCKER_IMAGE_NAME} ${DOCKER_IMAGE_NAME}-dev
-          DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME}-dev"
-          bash push-image.sh ${DOCKER_IMAGE_NAME} ${DH_USERNAME} ${DH_PASSWORD}
-          if [ -n "${DOCKER_IMAGE_EXTRA_TAGS}" ]; then
-            for EXTRA_TAG in ${DOCKER_IMAGE_EXTRA_TAGS}; do
-              EXTRA_TAG="${EXTRA_TAG}-dev"
-              docker tag ${DOCKER_IMAGE_NAME} ${EXTRA_TAG}
-              bash push-image.sh ${EXTRA_TAG} ${DH_USERNAME} ${DH_PASSWORD}
-            done
-          fi
+          bash push-image.sh "${DOCKER_IMAGE_NAME}" "${DH_USERNAME}" "${DH_PASSWORD}" "${DOCKER_IMAGE_EXTRA_TAGS}" "develop"
diff --git a/.github/workflows/push-develop.yml.template b/.github/workflows/push-develop.yml.template
@@ -21,40 +21,32 @@ jobs:
         with:
           ref: develop
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Installing dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install debootstrap
           sudo gem install docker-api serverspec
       - name: Building docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DEBIAN_SUITE: ${{ matrix.debian-suite }}
+          DH_USERNAME: ${{ secrets.DH_USERNAME }}
+          DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          DOCKER_IMAGE_TARGET="${DOCKER_IMAGE_NAME##dockershelf/}"
-          sed -i -r 's|FROM\s*(.*?)|FROM \1-dev|g' "${DOCKER_IMAGE_TARGET/://}/Dockerfile"
-          sed -i -r 's|FROM scratch-dev|FROM scratch|g' "${DOCKER_IMAGE_TARGET/://}/Dockerfile"
-          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}"
+          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}" "${DH_USERNAME}" "${DH_PASSWORD}" "develop"
       - name: Testing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
         run: |
-          bash test-image.sh "${DOCKER_IMAGE_NAME}" "${DOCKER_IMAGE_EXTRA_TAGS}"
+          bash test-image.sh "${DOCKER_IMAGE_NAME}" "develop"
       - name: Pushing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
           DH_USERNAME: ${{ secrets.DH_USERNAME }}
           DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          docker tag ${DOCKER_IMAGE_NAME} ${DOCKER_IMAGE_NAME}-dev
-          DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME}-dev"
-          bash push-image.sh ${DOCKER_IMAGE_NAME} ${DH_USERNAME} ${DH_PASSWORD}
-          if [ -n "${DOCKER_IMAGE_EXTRA_TAGS}" ]; then
-            for EXTRA_TAG in ${DOCKER_IMAGE_EXTRA_TAGS}; do
-              EXTRA_TAG="${EXTRA_TAG}-dev"
-              docker tag ${DOCKER_IMAGE_NAME} ${EXTRA_TAG}
-              bash push-image.sh ${EXTRA_TAG} ${DH_USERNAME} ${DH_PASSWORD}
-            done
-          fi
+          bash push-image.sh "${DOCKER_IMAGE_NAME}" "${DH_USERNAME}" "${DH_PASSWORD}" "${DOCKER_IMAGE_EXTRA_TAGS}" "develop"
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -13,49 +13,45 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - docker-image-name: "dockershelf/debian:buster"
+          - docker-image-name: "dockershelf/debian:bullseye"
             docker-image-extra-tags: "dockershelf/debian:oldstable"
             debian-suite: "oldstable"
-          - docker-image-name: "dockershelf/debian:bullseye"
+          - docker-image-name: "dockershelf/debian:bookworm"
             docker-image-extra-tags: "dockershelf/debian:stable"
             debian-suite: "stable"
-          - docker-image-name: "dockershelf/debian:bookworm"
+          - 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"
             debian-suite: "unstable"
           - docker-image-name: "dockershelf/latex:basic"
           - docker-image-name: "dockershelf/latex:full"
-          - docker-image-name: "dockershelf/python:3.7-bullseye"
+          - 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.10-bullseye"
+          - docker-image-name: "dockershelf/python:3.10-bookworm"
             docker-image-extra-tags: "dockershelf/python:3.10-stable"
           - docker-image-name: "dockershelf/python:3.10-sid"
             docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10"
-          - docker-image-name: "dockershelf/python:3.11-bullseye"
+          - 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-bullseye"
-            docker-image-extra-tags: "dockershelf/python:3.12-stable"
-          - docker-image-name: "dockershelf/python:3.12-sid"
-            docker-image-extra-tags: "dockershelf/python:3.12-unstable dockershelf/python:3.12"
-          - docker-image-name: "dockershelf/node:12-bullseye"
+          - docker-image-name: "dockershelf/node:12-bookworm"
             docker-image-extra-tags: "dockershelf/node:12-stable"
           - docker-image-name: "dockershelf/node:12-sid"
             docker-image-extra-tags: "dockershelf/node:12-unstable dockershelf/node:12"
-          - docker-image-name: "dockershelf/node:14-bullseye"
+          - docker-image-name: "dockershelf/node:14-bookworm"
             docker-image-extra-tags: "dockershelf/node:14-stable"
           - docker-image-name: "dockershelf/node:14-sid"
             docker-image-extra-tags: "dockershelf/node:14-unstable dockershelf/node:14"
-          - docker-image-name: "dockershelf/node:16-bullseye"
+          - docker-image-name: "dockershelf/node:16-bookworm"
             docker-image-extra-tags: "dockershelf/node:16-stable"
           - docker-image-name: "dockershelf/node:16-sid"
             docker-image-extra-tags: "dockershelf/node:16-unstable dockershelf/node:16"
-          - docker-image-name: "dockershelf/node:18-bullseye"
+          - docker-image-name: "dockershelf/node:18-bookworm"
             docker-image-extra-tags: "dockershelf/node:18-stable"
           - docker-image-name: "dockershelf/node:18-sid"
             docker-image-extra-tags: "dockershelf/node:18-unstable dockershelf/node:18"
@@ -66,34 +62,32 @@ jobs:
         with:
           ref: master
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2 
       - name: Installing dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install debootstrap
           sudo gem install docker-api serverspec
       - name: Building docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DEBIAN_SUITE: ${{ matrix.debian-suite }}
+          DH_USERNAME: ${{ secrets.DH_USERNAME }}
+          DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}"
+          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}" "${DH_USERNAME}" "${DH_PASSWORD}" "master"
       - name: Testing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
         run: |
-          bash test-image.sh "${DOCKER_IMAGE_NAME}" "${DOCKER_IMAGE_EXTRA_TAGS}"
+          bash test-image.sh "${DOCKER_IMAGE_NAME}" "master"
       - name: Pushing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
           DH_USERNAME: ${{ secrets.DH_USERNAME }}
           DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          bash push-image.sh ${DOCKER_IMAGE_NAME} ${DH_USERNAME} ${DH_PASSWORD}
-          if [ -n "${DOCKER_IMAGE_EXTRA_TAGS}" ]; then
-            for EXTRA_TAG in ${DOCKER_IMAGE_EXTRA_TAGS}; do
-              docker tag ${DOCKER_IMAGE_NAME} ${EXTRA_TAG}
-              bash push-image.sh ${EXTRA_TAG} ${DH_USERNAME} ${DH_PASSWORD}
-            done
-          fi
+          bash push-image.sh "${DOCKER_IMAGE_NAME}" "${DH_USERNAME}" "${DH_PASSWORD}" "${DOCKER_IMAGE_EXTRA_TAGS}" "master"
diff --git a/.github/workflows/push-master.yml.template b/.github/workflows/push-master.yml.template
@@ -21,34 +21,32 @@ jobs:
         with:
           ref: master
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2 
       - name: Installing dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install debootstrap
           sudo gem install docker-api serverspec
       - name: Building docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DEBIAN_SUITE: ${{ matrix.debian-suite }}
+          DH_USERNAME: ${{ secrets.DH_USERNAME }}
+          DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}"
+          bash build-image.sh "${DOCKER_IMAGE_NAME}" "${DEBIAN_SUITE}" "${DH_USERNAME}" "${DH_PASSWORD}" "master"
       - name: Testing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
         run: |
-          bash test-image.sh "${DOCKER_IMAGE_NAME}" "${DOCKER_IMAGE_EXTRA_TAGS}"
+          bash test-image.sh "${DOCKER_IMAGE_NAME}" "master"
       - name: Pushing docker image
         env:
           DOCKER_IMAGE_NAME: ${{ matrix.docker-image-name }}
           DOCKER_IMAGE_EXTRA_TAGS: ${{ matrix.docker-image-extra-tags }}
           DH_USERNAME: ${{ secrets.DH_USERNAME }}
           DH_PASSWORD: ${{ secrets.DH_PASSWORD }}
         run: |
-          bash push-image.sh ${DOCKER_IMAGE_NAME} ${DH_USERNAME} ${DH_PASSWORD}
-          if [ -n "${DOCKER_IMAGE_EXTRA_TAGS}" ]; then
-            for EXTRA_TAG in ${DOCKER_IMAGE_EXTRA_TAGS}; do
-              docker tag ${DOCKER_IMAGE_NAME} ${EXTRA_TAG}
-              bash push-image.sh ${EXTRA_TAG} ${DH_USERNAME} ${DH_PASSWORD}
-            done
-          fi
+          bash push-image.sh "${DOCKER_IMAGE_NAME}" "${DH_USERNAME}" "${DH_PASSWORD}" "${DOCKER_IMAGE_EXTRA_TAGS}" "master"