Skip to content

Commit

Permalink
Merge pull request #923 from AppFlowy-IO/issue-839
Browse files Browse the repository at this point in the history
fix: allow gotrue service to work without postgres user
  • Loading branch information
khorshuheng authored Oct 23, 2024
2 parents f74b6a3 + e767f36 commit 30ff066
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push_latest_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Build and Push GoTrue
run: |
export TAG=${GITHUB_REF#refs/*/}
docker buildx build --platform linux/amd64,linux/arm64 -t appflowyinc/gotrue:${TAG} -t appflowyinc/gotrue:latest -f docker/gotrue.Dockerfile --push .
docker buildx build --platform linux/amd64,linux/arm64 -t appflowyinc/gotrue:${TAG} -t appflowyinc/gotrue:latest -f gotrue/Dockerfile --push docker/gotrue
appflowy_cloud_image:
runs-on: ubuntu-22.04
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ services:
gotrue:
restart: on-failure
build:
context: .
dockerfile: docker/gotrue.Dockerfile
context: docker/gotrue
dockerfile: docker/gotrue/Dockerfile
image: appflowyinc/gotrue:${GOTRUE_VERSION:-latest}
environment:
# There are a lot of options to configure GoTrue. You can reference the example config:
Expand Down
5 changes: 3 additions & 2 deletions docker/gotrue.Dockerfile → docker/gotrue/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ FROM golang as base
WORKDIR /go/src/supabase
RUN git clone https://github.com/supabase/auth.git --depth 1 --branch v2.159.1
WORKDIR /go/src/supabase/auth
COPY docker/gotrue.patch .
RUN git apply gotrue.patch
COPY patch/mfa_enabled.patch .
RUN git apply mfa_enabled.patch
RUN CGO_ENABLED=0 go build -o /auth .
RUN rm /go/src/supabase/auth/migrations/20240612123726_enable_rls_update_grants.up.sql

FROM scratch
COPY --from=base /usr/share/zoneinfo /usr/share/zoneinfo
Expand Down
File renamed without changes.

0 comments on commit 30ff066

Please sign in to comment.