Revert "chore: synchronize workspaces"

aeneasr · aeneasr · commit ef5b5362e238 · 2025-01-11T13:31:25.000+01:00
This reverts commit 80c92d4.
diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build
@@ -17,14 +17,12 @@ RUN go build -ldflags="-extldflags=-static" -tags sqlite,sqlite_omit_load_extens
 
 #########################
 
-FROM gcr.io/distroless/static-debian12:debug-nonroot AS runner
+FROM gcr.io/distroless/static-debian12:nonroot AS runner
 
 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)
 EXPOSE 4444 4445
 
-USER nonroot
-
 ENTRYPOINT ["hydra"]
 CMD ["serve", "all"]
diff --git a/.github/workflows/cve-scan.yaml b/.github/workflows/cve-scan.yaml
@@ -121,7 +121,7 @@ jobs:
         id: hadolint
         if: ${{ always() }}
         with:
-          dockerfile: .docker/Dockerfile-local-build
+          dockerfile: .docker/Dockerfile-build
           verbose: true
           format: "json"
           failure-threshold: "error"
diff --git a/Makefile b/Makefile
@@ -71,8 +71,7 @@ test-resetdb: node_modules
 # Build local docker images
 .PHONY: docker
 docker:
-	DOCKER_BUILDKIT=1 DOCKER_CONTENT_TRUST=1 docker build --progress=plain -f .docker/Dockerfile-local-build -t oryd/hydra:${IMAGE_TAG} .
-	echo "Local development image has been built."
+	DOCKER_BUILDKIT=1 DOCKER_CONTENT_TRUST=1 docker build --progress=plain -f .docker/Dockerfile-build -t oryd/hydra:${IMAGE_TAG} .
 
 .PHONY: e2e
 e2e: node_modules test-resetdb
diff --git a/quickstart.yml b/quickstart.yml
@@ -14,7 +14,7 @@ services:
     image: oryd/hydra:v2.2.0
     build:
       context: .
-      dockerfile: .docker/Dockerfile-local-build
+      dockerfile: .docker/Dockerfile-build
     ports:
       - "4444:4444" # Public port
       - "4445:4445" # Admin port
@@ -23,15 +23,16 @@ services:
     volumes:
       - type: volume
         source: hydra-sqlite
-        target: /mount/sqlite
+        target: /etc/sqlite
         read_only: false
       - 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:///etc/sqlite/db.sqlite?_fk=true
     restart: unless-stopped
+    user: 500:500
     depends_on:
       - hydra-migrate
     networks:
@@ -40,15 +41,16 @@ services:
     image: oryd/hydra:v2.2.0
     build:
       context: .
-      dockerfile: .docker/Dockerfile-local-build
+      dockerfile: .docker/Dockerfile-build
     environment:
-      - DSN=sqlite:///mount/sqlite/db.sqlite?_fk=true
+      - DSN=sqlite:///etc/sqlite/db.sqlite?_fk=true
     command: migrate -c /etc/config/hydra/hydra.yml sql up -e --yes
+    user: 500:500
     pull_policy: missing
     volumes:
       - type: volume
         source: hydra-sqlite
-        target: /mount/sqlite
+        target: /etc/sqlite
         read_only: false
       - type: bind
         source: ./contrib/quickstart/5-min
