From ee74d5222d8d92efbcf9c53fe08dd481d6f1acdf Mon Sep 17 00:00:00 2001 From: Joel Lee Date: Wed, 15 Feb 2023 17:45:00 +0800 Subject: [PATCH] fix: Change Dockerfile.dev target from netlify to Supabase (#973) Further renaming from netlify -> Supabase. Main change here is on the dev set up - if one cleans out existing image + volumes + cache and runs `make dev` the build step will error with `"Failed to load configuration: open .env.docker: no such file or directory` as Docker will look in `/go/src/github.com/netlify/gotrue` instead of `/go/src/github.com/supabase/gotrue` --------- Co-authored-by: joel@joellee.org --- Dockerfile | 6 +++--- Dockerfile.dev | 4 ++-- app.json | 2 +- netlify.toml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 79c291c90e..413228ee1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine as build +FROM golang:1.20-alpine as build ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOOS=linux @@ -16,7 +16,7 @@ COPY . /go/src/github.com/supabase/gotrue RUN make build FROM alpine:3.17 -RUN adduser -D -u 1000 netlify +RUN adduser -D -u 1000 supabase RUN apk add --no-cache ca-certificates COPY --from=build /go/src/github.com/supabase/gotrue/gotrue /usr/local/bin/gotrue @@ -24,5 +24,5 @@ COPY --from=build /go/src/github.com/supabase/gotrue/migrations /usr/local/etc/g ENV GOTRUE_DB_MIGRATIONS_PATH /usr/local/etc/gotrue/migrations -USER netlify +USER supabase CMD ["gotrue"] diff --git a/Dockerfile.dev b/Dockerfile.dev index 079a40bb11..8df1f7404c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,11 +1,11 @@ -FROM golang:1.19-alpine +FROM golang:1.20-alpine ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOOS=linux RUN apk add --no-cache make git bash -WORKDIR /go/src/github.com/netlify/gotrue +WORKDIR /go/src/github.com/supabase/gotrue # Pulling dependencies COPY ./Makefile ./go.* ./ diff --git a/app.json b/app.json index 619f7e0fcb..4868656308 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "name": "Gotrue", "description": "", "website": "https://www.gotrueapi.org", - "repository": "https://github.com/netlify/gotrue", + "repository": "https://github.com/supabase/gotrue", "env": { "DATABASE_URL": {}, "GOTRUE_DB_DRIVER": { diff --git a/netlify.toml b/netlify.toml index 4bf4f5fe4b..a501111b48 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,6 +4,6 @@ [[redirects]] from = "/*" -to = "https://github.com/netlify/gotrue" +to = "https://github.com/supabase/gotrue" status = 302 force = true