Skip to content

Commit e002557

Browse files
authored
Merge pull request #65 from essentialkaos/develop
Improve GitHub Actions workflow
2 parents 0004cc8 + 55e799f commit e002557

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ jobs:
1515

1616
env:
1717
SRC_DIR: src/github.com/${{ github.repository }}
18+
GO111MODULE: auto
1819

1920
strategy:
2021
matrix:
21-
go: [ '1.14.x', '1.15.x' ]
22+
go: [ '1.15.x', '1.16.x' ]
2223

2324
steps:
2425
- name: Set up Go
@@ -63,7 +64,7 @@ jobs:
6364
password: ${{ secrets.DOCKERHUB_TOKEN }}
6465

6566
- name: Run Perfecto docker image
66-
uses: docker://essentialkaos/perfecto:slim
67+
uses: docker://essentialkaos/perfecto:micro
6768
with:
6869
args: --version
6970

@@ -74,7 +75,7 @@ jobs:
7475
7576
- name: Run Perfecto check
7677
env:
77-
IMAGE: essentialkaos/perfecto:slim
78+
IMAGE: essentialkaos/perfecto:micro
7879
run: ./perfecto-docker common/sslcli.spec
7980

8081
Hadolint:
@@ -84,7 +85,7 @@ jobs:
8485
needs: Go
8586

8687
env:
87-
HADOLINT_VERSION: 1.18.2
88+
HADOLINT_VERSION: 2.1.0
8889

8990
steps:
9091
- name: Checkout

Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ WORKDIR /go/src/github.com/essentialkaos/sslcli
66

77
COPY . .
88

9-
RUN apk add --no-cache git=~2.26 make=4.3-r0 && \
9+
ENV GO111MODULE=auto
10+
11+
RUN apk add --no-cache git=~2.30 make=4.3-r0 upx=3.96-r0 && \
1012
make deps && \
11-
make all
13+
make all && \
14+
upx sslcli
1215

1316
## FINAL IMAGE #################################################################
1417

15-
FROM alpine:3.10
18+
FROM alpine:3.13
1619

1720
LABEL name="SSLCLI Image" \
1821
vendor="ESSENTIAL KAOS" \
1922
maintainer="Anton Novojilov" \
2023
license="EKOL" \
21-
version="2020.06.13"
24+
version="2021.04.03"
2225

2326
COPY --from=builder /go/src/github.com/essentialkaos/sslcli/sslcli /usr/bin/
2427

0 commit comments

Comments
 (0)