Merge pull request #236 from Secure-Compliance-Solutions-LLC/dev

Release v21.4.2-v2

.dockerignore

@@ -5,3 +5,4 @@
 !gvm-sync-data/
 !report_formats/
 !scripts/*.sh
+!sshd_config

.github/workflows/docker-publish.yml

@@ -3,10 +3,10 @@ name: Docker Image Build and Release
 on:
   push:
     branches: [master]
-    # Publish semver tags as releases.
-    tags: ["v*.*.*"]
   pull_request:
     branches: [master, dev]
+  create:
+    tags:
 
 concurrency: ci-${{ github.ref }}
 
@@ -58,6 +58,16 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Relase Prepare for latest Tag
+        id: releasePreareLatestTag
+        shell: bash
+        run: |
+          if [[ "$GITHUB_EVENT_NAME" == "create" ]] && [[ "$GITHUB_REF" =~ ^refs/tags/v.* ]]; then
+            echo -n "::set-output name=latest::true"
+          else
+            echo -n "::set-output name=latest::false"
+          fi
+
       - name: Relase Prepare
         id: releasePreare
         run: |
@@ -96,13 +106,16 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: ${{ steps.releasePreare.outputs.images }}
+          flavor: |
+            latest=${{ steps.releasePreareLatestTag.outputs.latest}}
+            prefix=
+            suffix=
           tags: |
-            type=ref,event=branch,prefix=,suffix=
-            type=ref,event=pr,prefix=,suffix=
-            type=semver,pattern={{version}},prefix=,suffix=
-            type=semver,pattern={{raw}},prefix=,suffix=
-            type=semver,pattern={{major}}.{{minor}},prefix=,suffix=
-            type=sha,prefix=,suffix=
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{raw}}
+            type=semver,pattern={{major}}.{{minor}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
@@ -124,14 +137,17 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: ${{ steps.releasePreare.outputs.images }}
+          flavor: |
+            latest=${{ steps.releasePreareLatestTag.outputs.latest}}
+            prefix=
+            suffix=-full
           tags: |
-            type=ref,event=branch,prefix=,suffix=-full
-            type=ref,event=tag,prefix=,suffix=-full
-            type=ref,event=pr,prefix=,suffix=-full
-            type=semver,pattern={{version}},prefix=,suffix=-full
-            type=semver,pattern={{raw}},prefix=,suffix=-full
-            type=semver,pattern={{major}}.{{minor}},prefix=,suffix=-full
-            type=sha,prefix=,suffix=-full
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{raw}}
+            type=semver,pattern={{major}}.{{minor}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
@@ -154,13 +170,16 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: ${{ steps.releasePreare.outputs.images }}
+          flavor: |
+            latest=${{ steps.releasePreareLatestTag.outputs.latest}}
+            prefix=
+            suffix=-data
           tags: |
-            type=ref,event=branch,prefix=,suffix=-data
-            type=ref,event=pr,prefix=,suffix=-data
-            type=semver,pattern={{version}},prefix=,suffix=-data
-            type=semver,pattern={{raw}},prefix=,suffix=-data
-            type=semver,pattern={{major}}.{{minor}},prefix=,suffix=-data
-            type=sha,prefix=,suffix=-data
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{raw}}
+            type=semver,pattern={{major}}.{{minor}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
@@ -182,13 +201,16 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: ${{ steps.releasePreare.outputs.images }}
+          flavor: |
+            latest=${{ steps.releasePreareLatestTag.outputs.latest}}
+            prefix=
+            suffix=-data-full
           tags: |
-            type=ref,event=branch,prefix=,suffix=-data-full
-            type=ref,event=pr,prefix=,suffix=-data-full
-            type=semver,pattern={{version}},prefix=,suffix=-data-full
-            type=semver,pattern={{raw}},prefix=,suffix=-data-full
-            type=semver,pattern={{major}}.{{minor}},prefix=,suffix=-data-full
-            type=sha,prefix=,suffix=-data-full
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{raw}}
+            type=semver,pattern={{major}}.{{minor}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action

Dockerfile

@@ -85,6 +85,7 @@ COPY report_formats/* /report_formats/
 COPY config/supervisord.conf /etc/supervisord.conf
 COPY config/logrotate-gvm.conf /etc/logrotate.d/gvm
 COPY config/redis-openvas.conf /etc/redis.conf
+COPY config/sshd_config /etc/ssh/sshd_config
 
 
 ARG SETUP=0

config/supervisord.conf

@@ -146,7 +146,7 @@ stopasgroup=true
 killasgroup=true
 
 [program:gsad]
-command=/usr/sbin/gsad -f --verbose --http-only --timeout=%(ENV_TIMEOUT)s --no-redirect --mlisten=127.0.0.1 --mport=9390 --port=9392
+command=/usr/bin/gsad -f --verbose --http-only --timeout=%(ENV_TIMEOUT)s --no-redirect --mlisten=127.0.0.1 --mport=9390 --port=9392
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s_err.log
 priority=30
@@ -191,4 +191,4 @@ autorestart=true
 autostart=true
 stopsignal=TERM
 stopasgroup=true
-killasgroup=true
+killasgroup=true