Skip to content

Commit b52b886

Browse files
andyoneandyone
authored
Merge pull request #192 from essentialkaos/develop
Version 3.0.2
2 parents 7103956 + f356fce commit b52b886

18 files changed

Lines changed: 286 additions & 190 deletions

File tree

‎.codebeatsettings‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.docker/alpine.docker‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REGISTRY="docker.io"
44

55
## BUILDER #####################################################################
66

7-
FROM ${REGISTRY}/essentialkaos/golang:alpine3.18 as builder
7+
FROM ${REGISTRY}/essentialkaos/golang:alpine3.20 as builder
88

99
WORKDIR /go/src/github.com/essentialkaos/sslcli
1010

@@ -14,7 +14,7 @@ RUN make deps && make all
1414

1515
## FINAL IMAGE #################################################################
1616

17-
FROM ${REGISTRY}/essentialkaos/alpine:3.18
17+
FROM ${REGISTRY}/essentialkaos/alpine:3.20
1818

1919
LABEL org.opencontainers.image.title="sslcli" \
2020
org.opencontainers.image.description="Pretty awesome command-line client for public SSLLabs API" \

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: ❗ Bug Report
2+
description: File a bug report
3+
title: "[Bug]: "
4+
labels: ["issue • bug"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar bug reports. If so, please add a 👍 reaction to the existing issue.
14+
15+
- type: textarea
16+
attributes:
17+
label: Verbose application info
18+
description: Output of `sslcli -vv` command
19+
render: shell
20+
validations:
21+
required: true
22+
23+
- type: dropdown
24+
id: version
25+
attributes:
26+
label: Install tools
27+
description: How did you install this application
28+
options:
29+
- From Sources
30+
- RPM Package
31+
- Prebuilt Binary
32+
default: 0
33+
validations:
34+
required: true
35+
36+
- type: textarea
37+
attributes:
38+
label: Steps to reproduce
39+
description: Short guide on how to reproduce this problem on our site
40+
placeholder: |
41+
1. [First Step]
42+
2. [Second Step]
43+
3. [and so on...]
44+
validations:
45+
required: true
46+
47+
- type: textarea
48+
attributes:
49+
label: Expected behavior
50+
description: What you expected to happen
51+
validations:
52+
required: true
53+
54+
- type: textarea
55+
attributes:
56+
label: Actual behavior
57+
description: What actually happened
58+
validations:
59+
required: true
60+
61+
- type: textarea
62+
attributes:
63+
label: Additional info
64+
description: Include gist of relevant config, logs, etc.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.github/ISSUE_TEMPLATE/question.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: ❓ Question
2+
description: Question about application, configuration or code
3+
title: "[Question]: "
4+
labels: ["issue • question"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar question. If so, please add a 👍 reaction to the existing issue.
14+
15+
- type: textarea
16+
attributes:
17+
label: Question
18+
description: Detailed question
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
attributes:
24+
label: Related version application info
25+
description: Output of `sslcli -vv` command
26+
render: shell

‎.github/ISSUE_TEMPLATE/suggestion.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: ➕ Suggestion
2+
description: Suggest new feature or improvement
3+
title: "[Suggestion]: "
4+
labels: ["issue • suggestion"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar feature requests. If so, please add a 👍 reaction to the existing issue.
14+
>
15+
> Opening a feature request kicks off a discussion. Requests may be closed if we're not actively planning to work on them.
16+
17+
- type: textarea
18+
attributes:
19+
label: Proposal
20+
description: Description of the feature
21+
validations:
22+
required: true
23+
24+
- type: textarea
25+
attributes:
26+
label: Current behavior
27+
description: What currently happens
28+
validations:
29+
required: true
30+
31+
- type: textarea
32+
attributes:
33+
label: Desired behavior
34+
description: What you would like to happen
35+
validations:
36+
required: true
37+
38+
- type: textarea
39+
attributes:
40+
label: Use case
41+
description: Why is this important (helps with prioritizing requests)
42+
validations:
43+
required: true

.github/workflows/docker-push.yml renamed to .github/workflows/cd-release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Docker Push"
1+
name: CD (Release)
22

33
on:
44
release:
@@ -19,15 +19,13 @@ permissions:
1919

2020
env:
2121
IMAGE_NAME: ${{ github.repository }}
22+
DOCKER_FILE: alpine
2223

2324
jobs:
24-
Docker:
25-
name: Docker Build & Publish
25+
BuildImage:
26+
name: Image Build & Publish
2627
runs-on: ubuntu-latest
2728

28-
env:
29-
DOCKER_FILE: alpine
30-
3129
steps:
3230
- name: Checkout
3331
uses: actions/checkout@v4
@@ -92,7 +90,7 @@ jobs:
9290
- name: Check if build/rebuild is required
9391
id: build_check
9492
run: |
95-
if [[ "${{github.event_name}}" == "release" ]] ; then
93+
if [[ "$GITHUB_EVENT_NAME" == "release" ]] ; then
9694
echo "build=true" >> $GITHUB_OUTPUT
9795
exit 0
9896
fi

‎.github/workflows/ci-pr.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: CI (PR)
2+
3+
on:
4+
pull_request:
5+
branches: [master]
6+
workflow_dispatch:
7+
inputs:
8+
force_run:
9+
description: 'Force workflow run'
10+
required: true
11+
type: choice
12+
options: [yes, no]
13+
14+
permissions:
15+
actions: read
16+
contents: read
17+
statuses: write
18+
19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
CI:
25+
uses: ./.github/workflows/ci.yml
26+
secrets: inherit
27+
28+
ImageBuild:
29+
name: Container Image Build Check
30+
runs-on: ubuntu-latest
31+
32+
needs: CI
33+
34+
env:
35+
REGISTRY: ghcr.io
36+
37+
strategy:
38+
matrix:
39+
image: [ 'alpine' ]
40+
41+
steps:
42+
- name: Checkout
43+
uses: actions/checkout@v4
44+
45+
- name: Login to DockerHub
46+
uses: docker/login-action@v3
47+
env:
48+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
49+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
50+
with:
51+
username: ${{ secrets.DOCKERHUB_USERNAME }}
52+
password: ${{ secrets.DOCKERHUB_TOKEN }}
53+
54+
- name: Login to GitHub Container Registry
55+
uses: docker/login-action@v3
56+
with:
57+
registry: ghcr.io
58+
username: ${{ github.actor }}
59+
password: ${{ secrets.GITHUB_TOKEN }}
60+
61+
- name: Build Docker image
62+
run: |
63+
docker build --build-arg REGISTRY=${REGISTRY} -f .docker/${{matrix.image}}.docker -t ${{matrix.image}} .
64+
65+
- name: Show info about built Docker image
66+
uses: essentialkaos/docker-info-action@v1
67+
with:
68+
image: ${{matrix.image}}
69+
show-labels: true

‎.github/workflows/ci-push.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: CI (Push)
2+
3+
on:
4+
push:
5+
branches: [master, develop]
6+
workflow_dispatch:
7+
inputs:
8+
force_run:
9+
description: 'Force workflow run'
10+
required: true
11+
type: choice
12+
options: [yes, no]
13+
14+
permissions:
15+
actions: read
16+
contents: read
17+
statuses: write
18+
19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
CI:
25+
uses: ./.github/workflows/ci.yml
26+
secrets: inherit

0 commit comments

Comments
 (0)