Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: improve docker set up #3921

Merged
merged 26 commits into from
Jan 11, 2025
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
715fa08
chore/remove-nsswitch-hosts
polarathene Dec 28, 2024
84eb21a
chore: Revise scratch image
polarathene Dec 28, 2024
f8cd2c7
chore: Revise alpine images
polarathene Dec 28, 2024
24f5ba0
chore: Use the same busybox commands with distroless
polarathene Dec 28, 2024
81f378a
chore: Remove redundant `VOLUME` directives
polarathene Dec 28, 2024
e066ac1
chore: `Dockerfile-scratch` - Add commentary
polarathene Jan 5, 2025
66f7f01
chore: `Dockerfile-sqlite` - Add commentary
polarathene Jan 5, 2025
b86a2a0
chore: `Dockerfile-alpine` - Add commentary
polarathene Jan 5, 2025
e3eac04
fix: improve docker set up
aeneasr Jan 10, 2025
7d92281
chore: synchronize workspaces
aeneasr Jan 10, 2025
c62ff95
chore: synchronize workspaces
aeneasr Jan 10, 2025
f08780e
chore: synchronize workspaces
aeneasr Jan 10, 2025
99d1557
chore: synchronize workspaces
aeneasr Jan 10, 2025
e0c0a4a
chore: synchronize workspaces
aeneasr Jan 10, 2025
187922d
chore: synchronize workspaces
aeneasr Jan 10, 2025
b51141d
chore: synchronize workspaces
aeneasr Jan 10, 2025
91af1fc
chore: synchronize workspaces
aeneasr Jan 10, 2025
e61ad1c
chore: synchronize workspaces
aeneasr Jan 10, 2025
c24f156
chore: synchronize workspaces
aeneasr Jan 10, 2025
4449b70
Update .docker/README.md
aeneasr Jan 11, 2025
3691bbe
Update .docker/Dockerfile-local-build
aeneasr Jan 11, 2025
5be3b7d
Update .docker/Dockerfile-test-hsm
aeneasr Jan 11, 2025
4d11798
chore: synchronize workspaces
aeneasr Jan 11, 2025
fc235c6
chore: synchronize workspaces
aeneasr Jan 11, 2025
8eb814d
chore: synchronize workspaces
aeneasr Jan 11, 2025
84e3ce0
chore: synchronize workspaces
aeneasr Jan 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: synchronize workspaces
  • Loading branch information
aeneasr committed Jan 10, 2025

Verified

This commit was signed with the committer’s verified signature.
aeneasr hackerman
commit 187922d875b38caa98a2ed9a629a5acc562ce45d
3 changes: 1 addition & 2 deletions .docker/Dockerfile-test-hsm
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@ ENV HSM_ENABLED=true
ENV HSM_LIBRARY=/usr/lib/softhsm/libsofthsm2.so
ENV HSM_TOKEN_LABEL=hydra
ENV HSM_PIN=1234
ENV UPDATE_SNAPSHOTS=true

RUN apt-get -y install softhsm opensc
RUN pkcs11-tool --module "$HSM_LIBRARY" --slot 0 --init-token --so-pin 0000 --init-pin --pin "$HSM_PIN" --label "$HSM_TOKEN_LABEL"
@@ -30,4 +29,4 @@ RUN go test -p 1 -failfast -short -tags=sqlite,hsm ./...

FROM builder AS test-refresh-hsm

RUN go test -p 1 -failfast -short -tags=sqlite,hsm,refresh ./...
RUN UPDATE_SNAPSHOTS=true go test -p 1 -failfast -short -tags=sqlite,hsm,refresh ./...
Loading
Oops, something went wrong.