.github/workflows/release.yml

@@ -6,6 +6,12 @@ on:
       ref_name:
         description: Release Version
         required: true
+      test:
+        required: true
+        type: boolean
+      release:
+        required: true
+        type: boolean
   release:
     types: [created]
 
@@ -36,37 +42,58 @@ jobs:
       run: |
         go test ./...
         
-#    - name: Integration Test
-#      run: bash integration_test/test.sh
+    - name: Integration Test
+      if:  ${{ inputs.test }}
+      run: bash integration_test/test.sh
 
     - run: |
-        echo "VERSION=${{  github.ref_name || github.event.inputs.ref_name }}" >> $GITHUB_ENV
-    
+        echo "VERSION=${{ (github.ref_name == 'master' && github.event_name == 'workflow_dispatch') && github.event.inputs.ref_name || github.ref_name }}" >> $GITHUB_ENV
+
+    - name: get NFPM
+      if:  ${{ inputs.release }}
+      run: |
+          wget -qO- https://github.com/goreleaser/nfpm/releases/download/v2.41.1/nfpm_2.41.1_Linux_x86_64.tar.gz | tar --directory ./ -xz nfpm
+          chmod +x nfpm
+
+    - name: Create Packages
+      if:  ${{ inputs.release }}
+      env:
+          VERSION: ${{ env.VERSION }}
+          PACKAGE: "stenographer"
+          RELEASE: ${{ env.VERSION }}
+          ARCH: "amd64"
+      run: |
+          sed -i 's|v1.0.1|${{ env.VERSION }}|g' nfpm.yaml
+          ./nfpm pkg --config nfpm.yaml --target "./$PACKAGE-$RELEASE-$ARCH.deb"
+          ./nfpm pkg --config nfpm.yaml --target "./$PACKAGE-$RELEASE-$ARCH.rpm"
+
     - name: Upload release
-      if: github.event_name != 'pull_request'
+      if:  ${{ inputs.release }}
       uses: boxpositron/upload-multiple-releases@1.0.7
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         release_config: |
             stenographer
             stenoread
+            stenographer*.deb
+            stenographer*.rpm
         tag_name: ${{ env.VERSION }}
-        release_name: stenographer_${{ env.VERSION }}
+        release_name: ${{ env.VERSION }}
         draft: false
         prerelease: false
         overwrite: true   
 
     - name: Log in to the Container registry
-      if: false
+      if:  ${{ inputs.release }}
       uses: docker/login-action@v2.0.0
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Docker Build and push (server)
-      if: false
+      if:  ${{ inputs.release }}
       uses: docker/build-push-action@v3.0.0
       with:
         context: ./docker

docker/Dockerfile

@@ -11,7 +11,7 @@ ENV GOPATH /stenographer
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 
-RUN git clone github.com/qxip/stenographer /stenographer/src
+RUN git clone https://github.com/QXIP/stenographer /stenographer/src
 ENV BINDIR=/opt/stenographer/bin
 RUN mkdir -p ${BINDIR} && \
     cd /stenographer/src && \

nfpm.yaml

@@ -1,66 +1,71 @@
-# nfpm example config file
-#
-# check https://nfpm.goreleaser.com/configuration for detailed usage
-#
 name: "stenographer"
 arch: "amd64"
 platform: "linux"
 version: "v1.0.1"
 section: "default"
 priority: "extra"
 replaces:
-- stenographer
+  - stenographer
 provides:
-- stenographer
+  - stenographer
 recommends:
-- tcpdump
-- jq
+  - tcpdump
+  - jq
 suggests:
-- tshark
+  - tshark
 maintainer: "QXIP BV <bot@qxip.net>"
 description: |
   Stenographer is a full-packet-capture utility for buffering packets 
   to disk for intrusion detection and incident response purposes.
 vendor: "qxip"
 homepage: "http://github.com/qxip/stenographer"
 license: "Apache2"
-empty_folders:
-- /opt/stenographer
-- /opt/stenographer/configs
+
+# Updated contents block using new format
 contents:
-- src: ./stenocurl
-  dst: /usr/bin/stenocurl
-  file_info:
-    mode: 0755
-- src: ./stenoread
-  dst: /usr/bin/stenoread
-  file_info:
-    mode: 0755
-- src: ./stenokeys.sh
-  dst: /opt/stenographer/stenokeys.sh
-  file_info:
-    mode: 0755
-- src: ./stenographer
-  dst: /usr/bin/stenographer
-  file_info:
-    mode: 0700
-    owner: stenographer
-    group: root
-- src: ./stenotype/stenotype
-  dst: /usr/bin/stenotype
-  file_info:
-    mode: 0500
-    owner: stenographer
-    group: root
-- src: ./configs/*
-  dst: /opt/stenographer/configs
+  - src: ./stenocurl
+    dst: /usr/bin/stenocurl
+    file_info:
+      mode: 0755
+
+  - src: ./stenoread
+    dst: /usr/bin/stenoread
+    file_info:
+      mode: 0755
+
+  - src: ./stenokeys.sh
+    dst: /opt/stenographer/stenokeys.sh
+    file_info:
+      mode: 0755
+
+  - src: ./stenographer
+    dst: /usr/bin/stenographer
+    file_info:
+      mode: 0700
+      owner: stenographer
+      group: root
+
+  - src: ./stenotype/stenotype
+    dst: /usr/bin/stenotype
+    file_info:
+      mode: 0500
+      owner: stenographer
+      group: root
+
+  # Config files
+  - dst: /opt/stenographer
+    type: dir
+
+  - dst: /opt/stenographer/configs
+    type: dir
+
+  - src: ./configs/*
+    dst: /opt/stenographer/configs/
+
 overrides:
   rpm:
     scripts:
-#      preinstall: ./scripts/preinstall.sh
       postinstall: ./scripts/postinstall.sh
-#      postremove: ./scripts/postremove.sh
   deb:
     scripts:
       postinstall: ./scripts/postinstall.sh
-#      preremove: ./scripts/preremove.sh