Merge pull request #3 from secman-team/main

x

Author: abdfnx

.github/workflows/codeql.yml

@@ -1,21 +1,9 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
+name: CodeQL
 
 on:
   push:
     branches: [ main ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ main ]
   schedule:
     - cron: "45 10 * * 3"
@@ -29,26 +17,16 @@ jobs:
       fail-fast: false
       matrix:
         language: [ "go" ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
           languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
         uses: github/codeql-action/autobuild@v1
 
@@ -59,9 +37,5 @@ jobs:
       #    and modify them (or add more) to build your code if your project
       #    uses a compiled language
 
-      #- run: |
-      #   make bootstrap
-      #   make release
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v1

.github/workflows/docker.yml

@@ -0,0 +1,41 @@
+name: Secman Docker CI
+
+on:
+  push:
+    # Publish `main` as Docker `latest` image.
+    branches:
+      - main
+
+  pull_request:
+
+env:
+  IMAGE: ghcr.io/secman-team/secman
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+      
+      - name: Login to Github Packages
+        run: |
+          echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+
+      - name: Run Build
+        run: |
+          docker pull $IMAGE:latest
+          git clone https://github.com/secman-team/secman-docker
+          docker build -t $IMAGE --cache-from $IMAGE:latest --file ./secman-docker/Dockerfile .
+          docker push $IMAGE
+  
+  run:
+    needs: [ build ]
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run the image
+        run: docker run $IMAGE

.github/workflows/secman.yml

@@ -8,10 +8,9 @@ on:
     branches: [ main ]
 
 env:
-  CLONE_DOT_SECMAN: git clone https://github.com/secman-team/.secman.ex ~/.secman
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-  CONFIG_NAME: git config user.name secman_yo
-  CONFIG_EMAIL: git config user.email yo@secman.vercel.app
+  CONFIG_NAME: git config --global user.name secman_yo
+  CLONE_DOT_SECMAN: git clone https://github.com/secman-team/.secman.ex
 
 jobs:
   ubuntu:
@@ -20,42 +19,19 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Config
-        run: |
-          $CONFIG_NAME
-          $CONFIG_EMAIL
+        run: $CONFIG_NAME
 
       - name: Install secman (Linux)
         run: curl -fsSL https://secman-team.github.io/install.sh | bash
 
       - name: Clone .secman (ex folder)
-        run: $CLONE_DOT_SECMAN
+        run: $CLONE_DOT_SECMAN /home/runner/.secman
 
       - name: Run secman
         run: secman
 
-      - name: Run secman version
-        run: secman ver
-
-  macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Config
-        run: |
-          $CONFIG_NAME
-          $CONFIG_EMAIL
-
-      - name: Install secman (MacOS)
-        # shell: bash
-        shell: bash
-        run: curl -fsSL https://secman-team.github.io/install.sh | bash
-
-      - name: Clone .secman (ex folder)
-        run: $CLONE_DOT_SECMAN
-
-      - name: Run secman
-        run: secman
+      - name: Run secman Help
+        run: secman -h
 
       - name: Run secman version
         run: secman ver
@@ -67,9 +43,7 @@ jobs:
 
       - name: Config
         shell: powershell
-        run: |
-          $CONFIG_NAME
-          $CONFIG_EMAIL
+        run: $CONFIG_NAME
 
       - name: Install secman (Windows)
         run: |
@@ -78,10 +52,13 @@ jobs:
 
       - name: Clone .secman (ex folder)
         shell: powershell
-        run: $CLONE_DOT_SECMAN
+        run: git clone https://github.com/secman-team/.secman.ex C:\Users\runneradmin\.secman
 
       - name: Run secman
         run: secman
 
+      - name: Run secman Help
+        run: secman -h
+
       - name: Run secman version
         run: secman ver