Skip to content

Commit 4d969de

Browse files
giacomolancianogiacomolanciano
authored
Restructure project for SpazioDati org (#2)
1 parent 66a3932 commit 4d969de

File tree

29 files changed

+155
-162
lines changed

29 files changed

+155
-162
lines changed

‎.deepsource.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ name = "go"
99
enabled = true
1010

1111
[analyzers.meta]
12-
import_path = "github.com/goodwithtech/dockle"
12+
import_path = "github.com/SpazioDati/dockle"

‎.github/workflows/releasebuild.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
env:
1313
DOCKER_CLI_EXPERIMENTAL: "enabled"
14+
permissions:
15+
contents: read
16+
packages: write
17+
id-token: write
1418
steps:
1519
- uses: actions/checkout@master
1620
with:
@@ -28,29 +32,27 @@ jobs:
2832
go test ./...
2933
env:
3034
CGO_ENABLED: 0
31-
- name: Login to docker.io registry
32-
uses: docker/login-action@v1
33-
with:
34-
username: ${{ secrets.DOCKER_USERNAME }}
35-
password: ${{ secrets.DOCKER_PASSWORD }}
35+
# - name: Login to docker.io registry
36+
# uses: docker/login-action@v1
37+
# with:
38+
# username: ${{ secrets.DOCKER_USERNAME }}
39+
# password: ${{ secrets.DOCKER_PASSWORD }}
3640
- name: Login to ghcr.io registry
3741
uses: docker/login-action@v1
3842
with:
3943
registry: ghcr.io
40-
username: goodwithtech
41-
password: ${{ secrets.GH_PAT }}
42-
-
43-
name: Run GoReleaser
44+
username: SpazioDati
45+
password: ${{ secrets.GITHUB_TOKEN }}
46+
- name: Run GoReleaser
4447
if: success() && startsWith(github.ref, 'refs/tags/v')
4548
uses: goreleaser/goreleaser-action@v2
4649
with:
4750
distribution: goreleaser
4851
version: "~> v2"
4952
args: release --clean
5053
env:
51-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
52-
-
53-
name: Clear
54+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
- name: Clear
5456
if: always() && startsWith(github.ref, 'refs/tags/v')
5557
run: |
5658
rm -f ${HOME}/.docker/config.json

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM golang:1.22-alpine AS builder
2-
ARG TARGET_DIR="github.com/goodwithtech/dockle"
2+
ARG TARGET_DIR="github.com/SpazioDati/dockle"
33

44
WORKDIR /go/src/${TARGET_DIR}
55
RUN apk --no-cache add git

‎cmd/dockle/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package main
22

33
import (
4-
"github.com/goodwithtech/dockle/pkg"
5-
"github.com/goodwithtech/dockle/pkg/log"
64
l "log"
75
"os"
6+
7+
"github.com/SpazioDati/dockle/pkg"
8+
"github.com/SpazioDati/dockle/pkg/log"
89
)
910

1011
func main() {

‎config/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"os"
66
"strings"
77

8-
"github.com/goodwithtech/dockle/pkg/types"
8+
"github.com/SpazioDati/dockle/pkg/types"
99

10-
"github.com/goodwithtech/dockle/pkg/log"
10+
"github.com/SpazioDati/dockle/pkg/log"
1111
"github.com/urfave/cli"
1212
)
1313

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/goodwithtech/dockle
1+
module github.com/SpazioDati/dockle
22

33
go 1.22.10
44

‎goreleaser.yaml‎

Lines changed: 64 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ builds:
66
ldflags:
77
- -s -w
88
- "-extldflags '-static'"
9-
- -X github.com/goodwithtech/dockle/pkg.version={{.Version}}
9+
- -X github.com/SpazioDati/dockle/pkg.version={{.Version}}
1010
env:
1111
- CGO_ENABLED=0
1212
goos:
@@ -21,68 +21,67 @@ builds:
2121
goarm:
2222
- 7
2323

24-
nfpms:
25-
-
26-
formats:
27-
- apk
28-
- deb
29-
- rpm
30-
vendor: "goodwithtech"
31-
homepage: "https://github.com/goodwithtech"
32-
maintainer: "Tomoya Amachi <[email protected]>"
33-
description: "A Security and Dockerfile checker for Containers"
34-
license: "AGPL"
35-
file_name_template: >-
36-
{{ .ProjectName }}_{{ .Version }}_
37-
{{- if eq .Os "darwin" }}macOS
38-
{{- else if eq .Os "openbsd" }}OpenBSD
39-
{{- else if eq .Os "netbsd" }}NetBSD
40-
{{- else if eq .Os "freebsd" }}FreeBSD
41-
{{- else if eq .Os "dragonfly" }}DragonFlyBSD
42-
{{- else}}{{- title .Os }}{{ end }}-
43-
{{- if eq .Arch "amd64" }}64bit
44-
{{- else if eq .Arch "arm" }}ARM
45-
{{- else if eq .Arch "arm64" }}ARM64
46-
{{- else }}{{ .Arch }}{{ end }}
24+
# nfpms:
25+
# -
26+
# formats:
27+
# - apk
28+
# - deb
29+
# - rpm
30+
# vendor: "goodwithtech"
31+
# homepage: "https://github.com/goodwithtech"
32+
# maintainer: "Tomoya Amachi <[email protected]>"
33+
# description: "A Security and Dockerfile checker for Containers"
34+
# license: "AGPL"
35+
# file_name_template: >-
36+
# {{ .ProjectName }}_{{ .Version }}_
37+
# {{- if eq .Os "darwin" }}macOS
38+
# {{- else if eq .Os "openbsd" }}OpenBSD
39+
# {{- else if eq .Os "netbsd" }}NetBSD
40+
# {{- else if eq .Os "freebsd" }}FreeBSD
41+
# {{- else if eq .Os "dragonfly" }}DragonFlyBSD
42+
# {{- else}}{{- title .Os }}{{ end }}-
43+
# {{- if eq .Arch "amd64" }}64bit
44+
# {{- else if eq .Arch "arm" }}ARM
45+
# {{- else if eq .Arch "arm64" }}ARM64
46+
# {{- else }}{{ .Arch }}{{ end }}
4747

48-
archives:
49-
-
50-
format: tar.gz
51-
format_overrides:
52-
- goos: windows
53-
format: zip
54-
name_template: >-
55-
{{ .ProjectName }}_{{ .Version }}_
56-
{{- if eq .Os "darwin" }}macOS
57-
{{- else if eq .Os "linux" }}Linux
58-
{{- else if eq .Os "openbsd" }}OpenBSD
59-
{{- else if eq .Os "netbsd" }}NetBSD
60-
{{- else if eq .Os "freebsd" }}FreeBSD
61-
{{- else if eq .Os "dragonfly" }}DragonFlyBSD
62-
{{- else}}{{- .Os }}{{ end }}-
63-
{{- if eq .Arch "amd64" }}64bit
64-
{{- else if eq .Arch "arm" }}ARM
65-
{{- else if eq .Arch "arm64" }}ARM64
66-
{{- else if eq .Arch "loong64" }}LOONG64
67-
{{- else }}{{ .Arch }}{{ end }}
68-
files:
69-
- README.md
70-
- LICENSE
48+
# archives:
49+
# -
50+
# format: tar.gz
51+
# format_overrides:
52+
# - goos: windows
53+
# format: zip
54+
# name_template: >-
55+
# {{ .ProjectName }}_{{ .Version }}_
56+
# {{- if eq .Os "darwin" }}macOS
57+
# {{- else if eq .Os "linux" }}Linux
58+
# {{- else if eq .Os "openbsd" }}OpenBSD
59+
# {{- else if eq .Os "netbsd" }}NetBSD
60+
# {{- else if eq .Os "freebsd" }}FreeBSD
61+
# {{- else if eq .Os "dragonfly" }}DragonFlyBSD
62+
# {{- else}}{{- .Os }}{{ end }}-
63+
# {{- if eq .Arch "amd64" }}64bit
64+
# {{- else if eq .Arch "arm" }}ARM
65+
# {{- else if eq .Arch "arm64" }}ARM64
66+
# {{- else if eq .Arch "loong64" }}LOONG64
67+
# {{- else }}{{ .Arch }}{{ end }}
68+
# files:
69+
# - README.md
70+
# - LICENSE
7171

72-
brews:
73-
-
74-
repository:
75-
owner: goodwithtech
76-
name: homebrew-r
77-
homepage: "https://github.com/goodwithtech/dockle"
78-
description: "Simple security auditing, helping build the Best Docker Images"
79-
test: |
80-
system "#{bin}/program --version"
72+
# brews:
73+
# -
74+
# repository:
75+
# owner: goodwithtech
76+
# name: homebrew-r
77+
# homepage: "https://github.com/goodwithtech/dockle"
78+
# description: "Simple security auditing, helping build the Best Docker Images"
79+
# test: |
80+
# system "#{bin}/program --version"
8181

8282
dockers:
8383
- image_templates:
84-
- 'goodwithtech/dockle:{{ .Tag }}-amd64'
85-
- 'ghcr.io/goodwithtech/dockle:{{ .Tag }}-amd64'
84+
- 'ghcr.io/SpazioDati/dockle:{{ .Tag }}-amd64'
8685
dockerfile: Dockerfile.releaser
8786
build_flag_templates:
8887
- "--pull"
@@ -93,8 +92,7 @@ dockers:
9392
- "--label=org.opencontainers.image.source={{.GitURL}}"
9493
- "--platform=linux/amd64"
9594
- image_templates:
96-
- 'goodwithtech/dockle:{{ .Tag }}-arm64'
97-
- 'ghcr.io/goodwithtech/dockle:{{ .Tag }}-arm64'
95+
- 'ghcr.io/SpazioDati/dockle:{{ .Tag }}-arm64'
9896
dockerfile: Dockerfile.releaser
9997
build_flag_templates:
10098
- "--pull"
@@ -106,19 +104,11 @@ dockers:
106104
- "--platform=linux/arm64"
107105
goarch: arm64
108106
docker_manifests:
109-
- name_template: 'goodwithtech/dockle:{{ .Tag }}'
107+
- name_template: 'ghcr.io/SpazioDati/dockle:{{ .Tag }}'
110108
image_templates:
111-
- 'goodwithtech/dockle:{{ .Tag }}-amd64'
112-
- 'goodwithtech/dockle:{{ .Tag }}-arm64'
113-
- name_template: 'ghcr.io/goodwithtech/dockle:{{ .Tag }}'
109+
- 'ghcr.io/SpazioDati/dockle:{{ .Tag }}-amd64'
110+
- 'ghcr.io/SpazioDati/dockle:{{ .Tag }}-arm64'
111+
- name_template: 'ghcr.io/SpazioDati/dockle:latest'
114112
image_templates:
115-
- 'ghcr.io/goodwithtech/dockle:{{ .Tag }}-amd64'
116-
- 'ghcr.io/goodwithtech/dockle:{{ .Tag }}-arm64'
117-
- name_template: 'goodwithtech/dockle:latest'
118-
image_templates:
119-
- 'goodwithtech/dockle:{{ .Tag }}-amd64'
120-
- 'goodwithtech/dockle:{{ .Tag }}-arm64'
121-
- name_template: 'ghcr.io/goodwithtech/dockle:latest'
122-
image_templates:
123-
- 'ghcr.io/goodwithtech/dockle:{{ .Tag }}-amd64'
124-
- 'ghcr.io/goodwithtech/dockle:{{ .Tag }}-arm64'
113+
- 'ghcr.io/SpazioDati/dockle:{{ .Tag }}-amd64'
114+
- 'ghcr.io/SpazioDati/dockle:{{ .Tag }}-arm64'

‎pkg/assessor/assessor.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ import (
55

66
deckodertypes "github.com/goodwithtech/deckoder/types"
77

8-
"github.com/goodwithtech/dockle/pkg/assessor/cache"
9-
"github.com/goodwithtech/dockle/pkg/assessor/privilege"
8+
"github.com/SpazioDati/dockle/pkg/assessor/cache"
9+
"github.com/SpazioDati/dockle/pkg/assessor/privilege"
1010

11-
"github.com/goodwithtech/dockle/pkg/assessor/contentTrust"
12-
"github.com/goodwithtech/dockle/pkg/assessor/credential"
13-
"github.com/goodwithtech/dockle/pkg/assessor/hosts"
11+
"github.com/SpazioDati/dockle/pkg/assessor/contentTrust"
12+
"github.com/SpazioDati/dockle/pkg/assessor/credential"
13+
"github.com/SpazioDati/dockle/pkg/assessor/hosts"
1414

15-
"github.com/goodwithtech/dockle/pkg/assessor/group"
16-
"github.com/goodwithtech/dockle/pkg/assessor/manifest"
17-
"github.com/goodwithtech/dockle/pkg/assessor/passwd"
18-
"github.com/goodwithtech/dockle/pkg/assessor/user"
15+
"github.com/SpazioDati/dockle/pkg/assessor/group"
16+
"github.com/SpazioDati/dockle/pkg/assessor/manifest"
17+
"github.com/SpazioDati/dockle/pkg/assessor/passwd"
18+
"github.com/SpazioDati/dockle/pkg/assessor/user"
1919

20-
"github.com/goodwithtech/dockle/pkg/log"
21-
"github.com/goodwithtech/dockle/pkg/types"
20+
"github.com/SpazioDati/dockle/pkg/log"
21+
"github.com/SpazioDati/dockle/pkg/types"
2222
)
2323

2424
var assessors []Assessor

‎pkg/assessor/cache/cache.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
deckodertypes "github.com/goodwithtech/deckoder/types"
1010
"github.com/goodwithtech/deckoder/utils"
1111

12-
"github.com/goodwithtech/dockle/pkg/log"
13-
"github.com/goodwithtech/dockle/pkg/types"
12+
"github.com/SpazioDati/dockle/pkg/log"
13+
"github.com/SpazioDati/dockle/pkg/types"
1414
)
1515

1616
var (

‎pkg/assessor/contentTrust/contentTrust.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
deckodertypes "github.com/goodwithtech/deckoder/types"
77

8-
"github.com/goodwithtech/dockle/pkg/log"
9-
"github.com/goodwithtech/dockle/pkg/types"
8+
"github.com/SpazioDati/dockle/pkg/log"
9+
"github.com/SpazioDati/dockle/pkg/types"
1010
)
1111

1212
var HostEnvironmentFileName = "ENVIRONMENT variable on HOST OS"

0 commit comments

Comments
 (0)