Skip to content

Commit 91e9c91

Browse files
ndeloofglours
authored andcommitted
run dockerized
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent eddcf70 commit 91e9c91

File tree

4 files changed

+7
-37
lines changed

4 files changed

+7
-37
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
uses: actions/checkout@v4
1515
- name: Check license
1616
run: DOCKER_BUILDKIT=1 make check-license
17-
- uses: actions/setup-go@v5
1817
- name: Check deepcopy
1918
run: |
2019
make deepcopy

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/[email protected]
23+
RUN go install github.com/kunalkushwaha/[email protected]

scripts/validate/fileheader

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

0 commit comments

Comments
 (0)