From 983300e71e68cbad5cf0412f860a6d2c6f01dc6d Mon Sep 17 00:00:00 2001 From: Tolga Ozen Date: Thu, 8 Aug 2024 18:32:18 +0300 Subject: [PATCH] chore: update Go version to 1.22.6 --- .air.toml | 2 +- Dockerfile.local | 5 +++-- go.mod | 2 +- integration-test/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.air.toml b/.air.toml index 402719928..e3844327b 100644 --- a/.air.toml +++ b/.air.toml @@ -19,7 +19,7 @@ log = "air_errors.log" # Watch these filename extensions. include_ext = ["go", "yaml",".env"] # Ignore these filename extensions or directories. -exclude_dir = ["tmp", "docs"] +exclude_dir = ["tmp", "docs", "playground", "sdk", "assets", "tools"] # It's not necessary to trigger build each time file changes if it's too frequent. delay = 500 # ms diff --git a/Dockerfile.local b/Dockerfile.local index 6ffc17096..a47689e16 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,4 +1,5 @@ -FROM golang:1.22-alpine +# Use the correct Go version +FROM golang:1.22.6-alpine3.20 RUN apk --no-cache add curl # Install the air binary so we get live code-reloading when we save files @@ -7,4 +8,4 @@ RUN curl -sSfL https://raw.githubusercontent.com/cosmtrek/air/master/install.sh # Run the air command in the directory where our code will live WORKDIR /app -ENTRYPOINT [ "air" ] \ No newline at end of file +ENTRYPOINT ["air"] \ No newline at end of file diff --git a/go.mod b/go.mod index ad7c1eb7e..97bc16f8a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Permify/permify -go 1.22.6 +go 1.22 require ( github.com/Masterminds/squirrel v1.5.4 diff --git a/integration-test/Dockerfile b/integration-test/Dockerfile index 728d70612..d31827faa 100644 --- a/integration-test/Dockerfile +++ b/integration-test/Dockerfile @@ -1,11 +1,11 @@ # Step 1: Modules caching -FROM golang:1.20-alpine3.16@sha256:6469405d7297f82d56195c90a3270b0806ef4bd897aa0628477d9959ab97a577 as modules +FROM golang:1.22.6-alpine3.20@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 as modules COPY go.mod go.sum /modules/ WORKDIR /modules RUN go mod download # Step 2: Tests -FROM golang:1.20-alpine3.16@sha256:6469405d7297f82d56195c90a3270b0806ef4bd897aa0628477d9959ab97a577 +FROM golang:1.22.6-alpine3.20@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 COPY --from=modules /go/pkg /go/pkg COPY . /app WORKDIR /app