update common tools

.chezmoidata.toml

@@ -0,0 +1 @@
+fofa = das

.devcontainer/Dockerfile

@@ -1,13 +1,13 @@
 FROM docker.pkg.github.com/nolte/vscode-devcontainers/devops:latest
 
-RUN mkdir -p ${WORKON_HOME} \
-  && virtualenv -p python3 ${WORKON_HOME}/development \
-  && source ${WORKON_HOME}/development/bin/activate \
-  && pip install pytest autopep8 pylint jsbeautifier tox \
-  && deactivate
+# RUN mkdir -p ${WORKON_HOME} \
+#   && virtualenv -p python3 ${WORKON_HOME}/development \
+#   && source ${WORKON_HOME}/development/bin/activate \
+#   && pip install pytest autopep8 pylint jsbeautifier tox \
+#   && deactivate
 
-RUN mkdir -p ${WORKON_HOME} \
-  && virtualenv -p python3 ${WORKON_HOME}/cookiecutter \
-  && source ${WORKON_HOME}/cookiecutter/bin/activate \
-  && pip install cookiecutter jinja2-ansible-filters pytest-cookies json-diff autopep8 pylint jsbeautifier \
-  && deactivate
+# RUN mkdir -p ${WORKON_HOME} \
+#   && virtualenv -p python3 ${WORKON_HOME}/cookiecutter \
+#   && source ${WORKON_HOME}/cookiecutter/bin/activate \
+#   && pip install cookiecutter jinja2-ansible-filters pytest-cookies json-diff autopep8 pylint jsbeautifier \
+#   && deactivate

.github/workflows/cleanup.yaml

@@ -0,0 +1,40 @@
+name: Branch Deleted
+
+#on: delete
+
+on:
+  push:
+    branches: ["feature/bump-up", "master"]
+  pull_request:
+    branches: [master]
+
+jobs:
+  delete:
+    strategy:
+      matrix:
+        image: 
+          - vscode-devcontainers/commons
+          - vscode-devcontainers/devops
+          - vscode-devcontainers/python
+          - vscode-devcontainers/commons-golang
+
+    # if: github.event.ref_type == 'branch'
+    runs-on: ubuntu-latest
+    steps:
+      - id: env-setup
+        run: |
+          export image_tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
+          export image_tag=$(echo $image_tag | tr / -)
+
+          echo "image_tag=$image_tag" >> $GITHUB_OUTPUT
+      - name: Delete image
+        uses: lazyfrosch/ghcr-delete-image-action@main
+        continue-on-error: true
+        with:
+          # NOTE: at now only orgs is supported
+          owner: ${{ github.actor }}
+          name:  ${{ matrix.image }}
+          is_user: true
+          # NOTE: using Personal Access Token
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ steps.env-setup.outputs.image_tag }}

.github/workflows/dockerimage.yml

@@ -2,128 +2,166 @@ name: Docker Image CI
 
 on:
   push:
-    branches: ["feature/ghworkflow", "master"]
+    branches: ["feature/bump-up", "master"]
   pull_request:
     branches: [master]
 
+
 jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    steps:
+      - id: env-setup
+        run: |
+          export image_tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
+          export image_tag=$(echo $image_tag | tr / -)
+
+          echo "image_tag=$image_tag" >> $GITHUB_OUTPUT
+    outputs:
+      image_tag: ${{ steps.env-setup.outputs.image_tag }}
+
   commons:
     runs-on: ubuntu-latest
+    needs: prepare
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3   
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}           
       #- name: Build the Docker image
       #  run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/.
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1.1.0
+      - id: build
+        name: Push to GitHub Packages
+        uses: docker/build-push-action@v5.0.0
         with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: nolte/vscode-devcontainers/commons
-          dockerfile: ./images/commons/Dockerfile
-          path: ./images/commons/.
-          tag_with_ref: false
-          add_git_labels: true
-          tags: latest
-  commonsgolang:
+          context: ./images/commons/.
+          tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ needs.prepare.outputs.image_tag }}
+          # outputs: type=docker,dest=/tmp/commons.tar
+
+
+          push: true
+      # - name: Upload artifact
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: commons
+      #     path: /tmp/commons.tar
+
+
+
+  devops:
     runs-on: ubuntu-latest
-    needs: commons
+    needs: [commons,prepare]
     steps:
-      - uses: actions/checkout@v2
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1.1.0
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: nolte/vscode-devcontainers/commons-golang
-          dockerfile: ./images/commons-golang/Dockerfile
-          path: ./images/commons-golang/.
-          tag_with_ref: false
-          add_git_labels: true
-          tags: latest
-  devgolang:
-    runs-on: ubuntu-latest
-    needs: commonsgolang
-    steps:
-      - uses: actions/checkout@v2
+
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
+
+      # - name: Download artifact
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: commons
+      #     path: /tmp
+      # - name: Load image
+      #   run: |
+      #     # docker buildx use default
+      #     echo "Tag"
+      #     echo ${{ needs.prepare.outputs.image_tag }}
+      #     echo "---"
+      #     docker load --input /tmp/commons.tar
+      #     echo "---"
+      #     docker image ls -a
+      #     echo "---"
+
+
       - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1.1.0
+        uses: docker/build-push-action@v5.0.0
         with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: nolte/vscode-devcontainers/golang
-          dockerfile: ./images/dev-golang/Dockerfile
-          path: ./images/dev-golang/.
-          tag_with_ref: false
-          add_git_labels: true
-          tags: latest
-  devops:
+
+          context: ./images/devops/.
+          tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }}
+          build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }}
+
+          push: true          
+  commonsgolang:
     runs-on: ubuntu-latest
-    needs: devgolang
+    needs: [commons,prepare]
     steps:
-      - uses: actions/checkout@v2
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1.1.0
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: nolte/vscode-devcontainers/devops
-          dockerfile: ./images/devops/Dockerfile
-          path: ./images/devops/.
-          tag_with_ref: false
-          add_git_labels: true
-          tags: latest
-  npm:
-    runs-on: ubuntu-latest
-    needs: devgolang
-    steps:
-      - uses: actions/checkout@v2
+          password: ${{ secrets.GITHUB_TOKEN }}        
+      # - name: Download artifact
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: commons
+      #     path: /tmp
+      # - name: Load image
+      #   run: |
+      #     docker load --input /tmp/commons.tar
+
       - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1.1.0
+        uses: docker/build-push-action@v5.0.0
         with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: nolte/vscode-devcontainers/npm
-          dockerfile: ./images/npm/Dockerfile
-          path: ./images/npm/.
-          tag_with_ref: false
-          add_git_labels: true
-          tags: latest
+          context: ./images/commons-golang/.
+          tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ needs.prepare.outputs.image_tag }}
+          #outputs: type=docker,dest=/tmp/commons-golang.tar
+          build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }}          
+          push: true
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: commons-golang
+          path: /tmp/commons-golang.tar
+
   python:
     runs-on: ubuntu-latest
-    needs: devgolang
+    needs: [commonsgolang,prepare]
     steps:
-      - uses: actions/checkout@v2
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1.1.0
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: nolte/vscode-devcontainers/python
-          dockerfile: ./images/python/Dockerfile
-          path: ./images/python/.
-          tag_with_ref: false
-          add_git_labels: true
-          tags: latest
-  k8soperator:
-    runs-on: ubuntu-latest
-    needs: [devgolang, devops]
-    steps:
-      - uses: actions/checkout@v2
+          password: ${{ secrets.GITHUB_TOKEN }}        
+      # - name: Download artifact
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: commons-golang
+      #     path: /tmp
+      # - name: Load image
+      #   run: |
+      #     docker load --input /tmp/commons-golang.tar
+
       - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1.1.0
+        uses: docker/build-push-action@v5.0.0
         with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: nolte/vscode-devcontainers/k8s-operator
-          dockerfile: ./images/k8sOperator/Dockerfile
-          path: ./images/k8sOperator/.
-          tag_with_ref: false
-          add_git_labels: true
-          tags: latest
+          context: ./images/python/.
+          tags: ghcr.io/nolte/vscode-devcontainers/python:${{ needs.prepare.outputs.image_tag }}
+          build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }}
+
+
+          push: true          

Makefile

@@ -1,5 +1,5 @@
 .PHONY: build
-REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers
+REGISTRY=ghcr.io/nolte/vscode-devcontainers
 
 default: build
 

README.md

@@ -1,6 +1,8 @@
 # Visual Studo Code DevContainers
 
-The Containers are tested with Docker ``19.03.8`` and based on [qdm12/basedevcontainer](https://github.com/qdm12/basedevcontainer).
+A standardised development environment is necessary for working on a wide range of projects, even after a certain period of time has elapsed.
+
+So we create a set of pre configured [Dev Containers](https://code.visualstudio.com/docs/remote/containers) based on [qdm12/basedevcontainer](https://github.com/qdm12/basedevcontainer).
 
 ## Usage
 
@@ -30,30 +32,23 @@ For build the images localy use the ``Makefile`` with ``make build`` and trink a
 
 | *image* (*project_type*)                                                        | *base on*                          | *description* |
 |---------------------------------------------------------------------------------|------------------------------------|---------------|
-| ```docker.pkg.github.com/nolte/vscode-devcontainers/commons``` _(default)_      |                                    |               |
-| ```docker.pkg.github.com/nolte/vscode-devcontainers/devops``` _(devops)_        | ```vscode-devcontainers/commons``` |               |
-| ```docker.pkg.github.com/nolte/vscode-devcontainers/python``` _(python)_        | ```vscode-devcontainers/commons``` |               |
-| ```docker.pkg.github.com/nolte/vscode-devcontainers/golang``` _(golang)_        | ```vscode-devcontainers/commons``` |               |
-| ```docker.pkg.github.com/nolte/vscode-devcontainers/k8s-operator``` _(default)_ | ```vscode-devcontainers/golang```  |               |
-| ```docker.pkg.github.com/nolte/vscode-devcontainers/npm``` _(npm)_              | ```vscode-devcontainers/commons``` |               |
-| ```docker.pkg.github.com/nolte/vscode-devcontainers/iot``` _(iot)_              | ```vscode-devcontainers/commons``` |               |
+| ```ghcr.io/nolte/vscode-devcontainers/commons``` _(default)_      |                                    |               |
+| ```ghcr.io/nolte/vscode-devcontainers/devops``` _(devops)_        | ```vscode-devcontainers/commons``` |               |
+| ```ghcr.io/nolte/vscode-devcontainers/python``` _(python)_        | ```vscode-devcontainers/commons``` |               |
+| ```ghcr.io/nolte/vscode-devcontainers/golang``` _(golang)_        | ```vscode-devcontainers/commons``` |               |
+| ```ghcr.io/nolte/vscode-devcontainers/k8s-operator``` _(default)_ | ```vscode-devcontainers/golang```  |               |
+| ```ghcr.io/nolte/vscode-devcontainers/npm``` _(npm)_              | ```vscode-devcontainers/commons``` |               |
+| ```ghcr.io/nolte/vscode-devcontainers/iot``` _(iot)_              | ```vscode-devcontainers/commons``` |               |
 
 
 ... sorry but at the moment the Pulic Github Docker Repoisitory is not realy public like [hub.docker.com]. see ([github.community](https://github.community/t5/GitHub-Actions/docker-pull-from-public-GitHub-Package-Registry-fail-with-quot/td-p/32782))
 
 ```bash
-pass internet/github.com/nolte/package_management_token | docker login docker.pkg.github.com --username nolte --password-stdin
+pass internet/github.com/nolte/package_management_token | docker login ghcr.io --username nolte --password-stdin
 ```
 
 ### Basement Env
 
 ### DevOps Env
 
-Installed tools like [terraform](),[helm](),[kubectl](),[ansible]() and many more.
-
-#### Extra Terraform Providers
-
-* [terraform-provider-keycloak](https://github.com/mrparkers/terraform-provider-keycloak)
-* [terraform-provider-minio](https://github.com/aminueza/terraform-provider-minio)
-* [terraform-provider-kubectl](https://github.com/gavinbunney/terraform-provider-kubectl)
-* [terraform-harbor-provider](https://github.com/BESTSELLER/terraform-harbor-provider)
+This env will be configured by the [twpayne/chezmoi](https://github.com/twpayne/chezmoi) based Configuration scripts, [nolte/workstation](https://github.com/nolte/workstation).