Revert "Revert "chore: synchronize workspaces""

This reverts commit 512ba18.

Author: aeneasr

.docker/Dockerfile-alpine

@@ -3,8 +3,8 @@ FROM alpine:3.20
 RUN <<HEREDOC
     apk add --no-cache --upgrade ca-certificates
 
-    # Add a user/group for Ory with a stable UID + GID:
-    # NOTE: This only appears relevant for supporting hydra as non-root, otherwise unnecessary.
+    # Add a user/group for Ory with a stable UID + GID. Values are from nonroot from distroless
+    # for interoperability with other containers.
     addgroup --system --gid 65532 ory
     adduser --system --uid 65532 \
       --gecos "Ory User" \

.docker/Dockerfile-test-hsm

@@ -13,7 +13,7 @@ ENV CGO_ENABLED 1
 RUN go mod download
 COPY . .
 
-RUN go build -tags sqlite,json1,hsm -o /usr/bin/hydra
+RUN go build -tags sqlite,hsm -o /usr/bin/hydra
 
 ENV HSM_ENABLED=true
 ENV HSM_LIBRARY=/usr/lib/softhsm/libsofthsm2.so

quickstart.yml

@@ -10,6 +10,11 @@
 #                                                                         #
 ###########################################################################
 services:
+  sqlite:
+    image: busybox
+    volumes:
+      - hydra-sqlite:/mnt/sqlite
+    command: "chmod -R 777 /mnt/sqlite"
   hydra:
     image: oryd/hydra:v2.2.0
     build:
@@ -21,19 +26,17 @@ services:
       - "5555:5555" # Port for hydra token user
     command: serve -c /etc/config/hydra/hydra.yml all --dev
     volumes:
-      - type: volume
-        source: hydra-sqlite
-        target: /mount/sqlite
-        read_only: false
+      - hydra-sqlite:/mnt/sqlite:rw
       - type: bind
         source: ./contrib/quickstart/5-min
         target: /etc/config/hydra
     pull_policy: missing
     environment:
-      - DSN=sqlite:///mount/sqlite/db.sqlite?_fk=true
+      - DSN=sqlite:///mnt/sqlite/db.sqlite?_fk=true&mode=rwc
     restart: unless-stopped
     depends_on:
       - hydra-migrate
+      - sqlite
     networks:
       - intranet
   hydra-migrate:
@@ -42,20 +45,19 @@ services:
       context: .
       dockerfile: .docker/Dockerfile-local-build
     environment:
-      - DSN=sqlite:///mount/sqlite/db.sqlite?_fk=true
+      - DSN=sqlite:///mnt/sqlite/db.sqlite?_fk=true&mode=rwc
     command: migrate -c /etc/config/hydra/hydra.yml sql up -e --yes
     pull_policy: missing
     volumes:
-      - type: volume
-        source: hydra-sqlite
-        target: /mount/sqlite
-        read_only: false
+      - hydra-sqlite:/mnt/sqlite:rw
       - type: bind
         source: ./contrib/quickstart/5-min
         target: /etc/config/hydra
     restart: on-failure
     networks:
       - intranet
+    depends_on:
+      - sqlite
   consent:
     environment:
       - HYDRA_ADMIN_URL=http://hydra:4445

test/conformance/hydra/Dockerfile

@@ -20,7 +20,7 @@ COPY . .
 
 RUN go build -tags sqlite -o /usr/bin/hydra
 
-VOLUME /var/lib/sqlite
+VOLUME /mnt/sqlite
 
 # Exposing the ory home directory
 VOLUME /home/ory