diff --git a/Makefile b/Makefile index 5713bcc..256e008 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ build: -t $(IMAGE_TAG) . test-mariadb-up: - @COMPOSE_HTTP_TIMEOUT=180 docker-compose \ + @COMPOSE_HTTP_TIMEOUT=180 docker compose \ -f docker/docker-compose-mariadb.test.yml \ -p mariadb_$(GITHUB_SHA) up \ --force-recreate \ @@ -45,13 +45,13 @@ test-mariadb-up: --build test-mariadb-down: - @COMPOSE_HTTP_TIMEOUT=180 docker-compose \ + @COMPOSE_HTTP_TIMEOUT=180 docker compose \ -f docker/docker-compose-mariadb.test.yml \ -p mariadb_$(GITHUB_SHA) down \ -v --rmi local test-mysql-up: - @COMPOSE_HTTP_TIMEOUT=180 docker-compose \ + @COMPOSE_HTTP_TIMEOUT=180 docker compose \ -f docker/docker-compose-mysql.test.yml \ -p mysql_$(GITHUB_SHA) up \ --force-recreate \ @@ -60,7 +60,7 @@ test-mysql-up: --build test-mysql-down: - @COMPOSE_HTTP_TIMEOUT=180 docker-compose \ + @COMPOSE_HTTP_TIMEOUT=180 docker compose \ -f docker/docker-compose-mysql.test.yml \ -p mysql_$(GITHUB_SHA) down \ -v --rmi local diff --git a/docker/Dockerfile b/docker/Dockerfile index a5f7f8b..54e182d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 AS build +FROM golang:1.24 AS build RUN --mount=type=secret,id=GITHUB_TOKEN,required \ git config --global url."https://$(cat /run/secrets/GITHUB_TOKEN):@github.com/".insteadOf "https://github.com/" @@ -12,8 +12,8 @@ COPY go.mod go.sum /src/ COPY . /src/ RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o /app/server cmd/server/main.go \ - && CGO_ENABLED=0 go build -ldflags="-w -s" -o /app/migration cmd/migration/main.go \ - && CGO_ENABLED=0 GOOS=linux go build -a -tags musl -installsuffix cgo -o /app/server-grpc cmd/grpc/main.go + && CGO_ENABLED=0 go build -ldflags="-w -s" -o /app/migration cmd/migration/main.go \ + && CGO_ENABLED=0 GOOS=linux go build -a -tags musl -installsuffix cgo -o /app/server-grpc cmd/grpc/main.go FROM gcr.io/distroless/static-debian11 AS release diff --git a/docker/compose.grpc.yaml b/docker/compose.grpc.yaml index f4511bc..829ce3a 100644 --- a/docker/compose.grpc.yaml +++ b/docker/compose.grpc.yaml @@ -1,5 +1,3 @@ -version: '3.9' - services: rio-http: image: hungdv136/rio:v1.2.3 diff --git a/docker/compose.yaml b/docker/compose.yaml index 445410a..491203f 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -1,5 +1,3 @@ -version: '3.9' - services: rio: image: hungdv136/rio:v1.2.3 diff --git a/docker/docker-compose-mariadb.test.yml b/docker/docker-compose-mariadb.test.yml index 9a69484..7e465a0 100644 --- a/docker/docker-compose-mariadb.test.yml +++ b/docker/docker-compose-mariadb.test.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: app: build: diff --git a/docker/docker-compose-mysql.test.yml b/docker/docker-compose-mysql.test.yml index 3052c7c..3db2f94 100644 --- a/docker/docker-compose-mysql.test.yml +++ b/docker/docker-compose-mysql.test.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: app: build: diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 6f465da..40335c7 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -1,8 +1,6 @@ -version: '3.9' - services: db: - image: mysql:8.0.18 + image: mysql:8.0.36 environment: - MYSQL_USER=admin - MYSQL_PASSWORD=password diff --git a/docker/test.Dockerfile b/docker/test.Dockerfile index 33a6da6..3988326 100644 --- a/docker/test.Dockerfile +++ b/docker/test.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 AS base +FROM golang:1.24 AS base ARG GITHUB_TOKEN diff --git a/go.mod b/go.mod index 8d0ad6b..38f023d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hungdv136/rio -go 1.18 +go 1.24 require ( github.com/Masterminds/sprig/v3 v3.2.3 diff --git a/go.sum b/go.sum index e8f044e..34569c9 100644 --- a/go.sum +++ b/go.sum @@ -419,6 +419,7 @@ github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw= @@ -474,6 +475,7 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -595,6 +597,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -800,6 +803,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= @@ -1031,6 +1035,7 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=