Skip to content

Commit

Permalink
fix: Change Dockerfile.dev target from netlify to Supabase (supabase#973
Browse files Browse the repository at this point in the history
)

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: [email protected] <[email protected]>
  • Loading branch information
J0 and [email protected] authored Feb 15, 2023
1 parent 55544e2 commit ee74d52
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,13 +16,13 @@ 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
COPY --from=build /go/src/github.com/supabase/gotrue/migrations /usr/local/etc/gotrue/migrations/

ENV GOTRUE_DB_MIGRATIONS_PATH /usr/local/etc/gotrue/migrations

USER netlify
USER supabase
CMD ["gotrue"]
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -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.* ./
Expand Down
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

[[redirects]]
from = "/*"
to = "https://github.com/netlify/gotrue"
to = "https://github.com/supabase/gotrue"
status = 302
force = true

0 comments on commit ee74d52

Please sign in to comment.