Revert "chore: synchronize workspaces"

aeneasr · aeneasr · commit c3e4d595f883 · 2025-01-11T13:31:25.000+01:00
This reverts commit 79a834d.
diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build
@@ -3,6 +3,7 @@ FROM golang:1.22 AS builder
 WORKDIR /go/src/github.com/ory/hydra
 
 RUN apt-get update && apt-get upgrade -y &&\
+    mkdir -p /var/lib/sqlite &&\
     mkdir -p ./internal/httpclient
 
 COPY go.mod go.sum ./
@@ -19,6 +20,7 @@ RUN go build -ldflags="-extldflags=-static" -tags sqlite,sqlite_omit_load_extens
 
 FROM gcr.io/distroless/static-debian12:nonroot AS runner
 
+COPY --from=builder --chown=nonroot:nonroot /var/lib/sqlite /var/lib/sqlite
 COPY --from=builder /usr/bin/hydra /usr/bin/hydra
 
 # Declare the standard ports used by hydra (4444 for public service endpoint, 4445 for admin service endpoint)
diff --git a/quickstart.yml b/quickstart.yml
@@ -23,14 +23,14 @@ services:
     volumes:
       - type: volume
         source: hydra-sqlite
-        target: /etc/sqlite
+        target: /var/lib/sqlite
         read_only: false
       - type: bind
         source: ./contrib/quickstart/5-min
         target: /etc/config/hydra
     pull_policy: missing
     environment:
-      - DSN=sqlite:///etc/sqlite/db.sqlite?_fk=true
+      - DSN=sqlite:///var/lib/sqlite/db.sqlite?_fk=true
     restart: unless-stopped
     user: 500:500
     depends_on:
@@ -43,14 +43,14 @@ services:
       context: .
       dockerfile: .docker/Dockerfile-build
     environment:
-      - DSN=sqlite:///etc/sqlite/db.sqlite?_fk=true
-    command: migrate -c /etc/config/hydra/hydra.yml sql up -e --yes
+      - DSN=sqlite:///var/lib/sqlite/db.sqlite?_fk=true
+    command: migrate -c /etc/config/hydra/hydra.yml sql -e --yes
     user: 500:500
     pull_policy: missing
     volumes:
       - type: volume
         source: hydra-sqlite
-        target: /etc/sqlite
+        target: /var/lib/sqlite
         read_only: false
       - type: bind
         source: ./contrib/quickstart/5-min
