Merge pull request #54 from logchange/migrate-to-logchange-org

change docker actions and adjust to release version 1.0.0

Author: marwin1991

.github/workflows/docker-publish.yml

@@ -1,49 +1,47 @@
-name: Docker
+name: Publish Docker image
 
 on:
   release:
     types: [published]
 
-env:
-  REGISTRY: docker.io
-  IMAGE_NAME: ${{ github.repository }}
-
-
 jobs:
-  build:
-
+  push_to_registry:
+    name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
-      id-token: write
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/angrymeir/secscanner2junit
-          tags: |
-            type=semver,pattern={{version}}
-
       - name: Sleep for 180 seconds # so that the package has been published to PyPI in the meantime
         run: sleep 180
         shell: bash
 
-      - name: Kaniko build
-        uses: aevea/[email protected]
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: logchange/secscanner2junit
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VERSION=${{ github.ref_name }}
+
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v3
         with:
-          image: ${{ env.REGISTRY }}/angrymeir/secscanner2junit
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-          tag_with_latest: true
-          extra_args: --build-arg=VERSION=${{ github.ref_name }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: logchange/secscanner2junit

pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "secscanner2junit"
-version = "0.1.18"
+version = "1.0.0"
 description = "Convert Security Scanner Output to JUnit Format"
-authors = ["Florian Angermeir <[email protected]>"]
+authors = ["logchange team <[email protected]", "Florian Angermeir <[email protected]>"]
 license = "GPL-3.0-only"
 readme = "README.md"
-homepage = "https://github.com/angrymeir/SecScanner2JUnit"
-repository = "https://github.com/angrymeir/SecScanner2JUnit"
+homepage = "https://github.com/logchange/SecScanner2JUnit"
+repository = "https://github.com/logchange/SecScanner2JUnit"
 packages = [
   { include = 'secscanner2junit' },
 ]