Merge pull request #67 from essentialkaos/develop

Improve GitHub Actions CI workflow

Author: andyone

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.15.x', '1.16.x' ]
+        go: [ '1.16.x', '1.17.x' ]
 
     steps:
       - name: Set up Go
@@ -47,6 +47,52 @@ jobs:
         working-directory: ${{env.SRC_DIR}}
         run: make all
 
+  Aligo:
+    name: Aligo
+    runs-on: ubuntu-latest
+
+    needs: Go
+
+    env:
+      SRC_DIR: src/github.com/${{ github.repository }}
+      GO111MODULE: auto
+
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.x'
+        id: go
+
+      - name: Setup PATH
+        run: |
+          echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
+          echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
+          echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: ${{env.SRC_DIR}}
+
+      - name: Download dependencies
+        working-directory: ${{env.SRC_DIR}}
+        run: make deps
+
+      - name: Install Aligo
+        working-directory: ${{env.SRC_DIR}}
+        run: |
+          wget https://apps.kaos.st/aligo/latest/linux/x86_64/aligo
+          chmod +x aligo
+
+      - name: Print Aligo version info
+        working-directory: ${{env.SRC_DIR}}
+        run: ./aligo --version
+
+      - name: Check Go structs alignment info
+        working-directory: ${{env.SRC_DIR}}
+        run: ./aligo check ./...
+
   Perfecto:
     name: Perfecto
     runs-on: ubuntu-latest
@@ -85,7 +131,7 @@ jobs:
     needs: Go
 
     env:
-      HADOLINT_VERSION: 2.1.0
+      HADOLINT_VERSION: 2.6.1
 
     steps:
       - name: Checkout
@@ -101,3 +147,23 @@ jobs:
 
       - name: Check Docker files
         run: ./hadolint Dockerfile
+
+  DockerBuild:
+    name: Docker Build Check
+    runs-on: ubuntu-latest
+
+    needs: Hadolint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build CentOS 7 image
+        run: |
+          docker build -f Dockerfile -t centos7 .

Dockerfile

@@ -8,20 +8,20 @@ COPY . .
 
 ENV GO111MODULE=auto
 
-RUN apk add --no-cache git=~2.30 make=4.3-r0 upx=3.96-r1 && \
+RUN apk add --no-cache git=~2.32 make=4.3-r0 upx=3.96-r1 && \
     make deps && \
     make all && \
     upx sslcli
 
 ## FINAL IMAGE #################################################################
 
-FROM alpine:3.13
+FROM essentialkaos/alpine:3.13
 
 LABEL name="SSLCLI Image" \
       vendor="ESSENTIAL KAOS" \
       maintainer="Anton Novojilov" \
       license="EKOL" \
-      version="2021.05.01"
+      version="2021.08.21"
 
 COPY --from=builder /go/src/github.com/essentialkaos/sslcli/sslcli /usr/bin/
 

README.md

@@ -24,7 +24,7 @@
 
 #### From source
 
-To build the SSLScan Client from scratch, make sure you have a working Go 1.14+ workspace ([instructions](https://golang.org/doc/install)), then:
+To build the SSLScan Client from scratch, make sure you have a working Go 1.16+ workspace ([instructions](https://golang.org/doc/install)), then:
 
 ```
 go get github.com/essentialkaos/sslcli