Skip to content

Commit

Permalink
chore: synchronize workspaces
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Jan 10, 2025
1 parent 5e035ab commit 1cd550e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .docker/Dockerfile-build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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 ./
Expand All @@ -20,7 +19,6 @@ 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)
Expand Down
10 changes: 5 additions & 5 deletions quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ services:
volumes:
- type: volume
source: hydra-sqlite
target: /var/lib/sqlite
target: /etc/sqlite
read_only: false
- type: bind
source: ./contrib/quickstart/5-min
target: /etc/config/hydra
pull_policy: missing
environment:
- DSN=sqlite:///var/lib/sqlite/db.sqlite?_fk=true
- DSN=sqlite:///etc/sqlite/db.sqlite?_fk=true
restart: unless-stopped
user: 500:500
depends_on:
Expand All @@ -43,14 +43,14 @@ services:
context: .
dockerfile: .docker/Dockerfile-build
environment:
- DSN=sqlite:///var/lib/sqlite/db.sqlite?_fk=true
command: migrate -c /etc/config/hydra/hydra.yml sql -e --yes
- 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: /var/lib/sqlite
target: /etc/sqlite
read_only: false
- type: bind
source: ./contrib/quickstart/5-min
Expand Down

0 comments on commit 1cd550e

Please sign in to comment.