Skip to content

Commit bd71318

Browse files
committed
run dockerized
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
1 parent 467c3a2 commit bd71318

File tree

5 files changed

+10
-36
lines changed

5 files changed

+10
-36
lines changed

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,20 @@ fmt: ## Format go files
3131
go fmt ./...
3232

3333
.PHONY: deepcopy
34-
deepcopy:
35-
goderive -h >/dev/null 2>&1 || go install github.com/awalterschulze/goderive@0a721d5b1d722ae6ba0dddefa1200607ca3ece97
36-
goderive ./types/...
34+
deepcopy: build-validate-image
35+
docker run --rm -v .:/go/src $(IMAGE_PREFIX)validate goderive ./types/...
3736

3837
.PHONY: build-validate-image
3938
build-validate-image:
4039
docker build . -f ci/Dockerfile -t $(IMAGE_PREFIX)validate
4140

4241
.PHONY: lint
4342
lint: build-validate-image
44-
docker run --rm $(IMAGE_PREFIX)validate bash -c "golangci-lint run --config ./.golangci.yml ./..."
43+
docker run --rm -v .:/go/src $(IMAGE_PREFIX)validate golangci-lint run --config ./.golangci.yml ./...
4544

4645
.PHONY: check-license
4746
check-license: build-validate-image
48-
docker run --rm $(IMAGE_PREFIX)validate bash -c "./scripts/validate/fileheader"
47+
docker run --rm -v .:/go/src $(IMAGE_PREFIX)validate ltag -t scripts/validate/template --excludes "validate dotenv" --check -v
4948

5049
.PHONY: setup
5150
setup: ## Setup the precommit hook

ci/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23
15+
FROM golang:1.24
1616

1717
WORKDIR /go/src
1818

1919
ARG GOLANGCILINT_VERSION=v1.64.5
2020
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCILINT_VERSION}
2121
RUN go install github.com/kunalkushwaha/ltag@latest && rm -rf /go/src/github.com/kunalkushwaha
22-
23-
COPY . .
22+
RUN go install github.com/awalterschulze/goderive@v0.5.1
23+
RUN go install github.com/kunalkushwaha/ltag@v0.2.5

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ require (
2121

2222
require (
2323
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/kunalkushwaha/ltag v0.2.5 // indirect
2425
github.com/pmezard/go-difflib v1.0.0 // indirect
2526
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
2627
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd
1212
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1313
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1414
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
15+
github.com/kunalkushwaha/ltag v0.2.5 h1:kW2/mVXqIUG5NvkZQCTeGKMDjBJ/BGVEgrdfHyA3fnI=
16+
github.com/kunalkushwaha/ltag v0.2.5/go.mod h1:w1hVMWOh870f+WAv/UIoZAy0bHCbPP4+W6JxNcPUiQA=
1517
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
1618
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
1719
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=

scripts/validate/fileheader

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

0 commit comments

Comments
 (0)