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.

Sign up for GitHub

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

Jump to bottom

Revision of the handling of Docker secrets in S6 #359

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Revision of the handling of Docker secrets in S6 #359

wants to merge 10 commits into from

Conversation

Psycho0verload
Copy link
Contributor

Complete revision of the handling of Docker Secrets with S6 overlay after borgmatic:1.8.13 caused errors in the implementation.

The following things have been changed:

  • Revision of Docker Secrets with S6
  • Documentation adapted
  • Bump python from 3.12.5-alpine3.19 to 3.12.7-alpine3.19
  • Bump S6_OVERLAY_VERSION from 3.1.6.2 to 3.2.0.2

Warning

Docker Secrets must now be defined differently. Instead of *_FILE now FILE__*

Testing

  • Build the Image with docker build -t borgmatic:testing .
  • Run docker run --rm -e BORG_PASSPHRASE='' borgmatic:testing`

Docker Secrets

  • With the changes in Docker Secrets and in compliance with the documentation, the Secrets continue to work properly

Closes #346, #358

@Psycho0verload
Delete the old script for Docker Secrets
f91196e
@Psycho0verload
refactor(docker-secrets): Add new way to handle Docker secrets
a22535d
@Psycho0verload
Delete old dependency
05e9c0b 
Fixing: 
```
fatal: during dependency resolution for service svc-cron: undefined service name secrets
```

Working on borgmatic-collective#346
@Psycho0verload
Fix(Dockerfile): Casing-Warning
0dc584b 
Working on borgmatic-collective#346
@Psycho0verload
Update(doku): Adapting the README to the new Secrets method
5acf08d 
Working on: borgmatic-collective#346
@Psycho0verload
Update(dockerfile): Update Dependencies borgmatic-collective#358
92568d1
@Psycho0verload
Update(Docu): Adapting the README to the new Secrets method
278b385 
Working on borgmatic-collective#346
@Psycho0verload
Update(dockerfile): Update Dependencies of S6_OVERLAY_VERSION
61d16ac
@Psycho0verload
Fix(docu): Add export to README
7620655 
Working on borgmatic-collective#346
@Psycho0verload
Add GNU-Hint
21a2efd
@Psycho0verload
Copy link
Contributor Author

@modem7 @grantbevis

grantbevis
grantbevis approved these changes Oct 28, 2024
View reviewed changes
Copy link
Collaborator

@grantbevis grantbevis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

modem7
modem7 approved these changes Nov 4, 2024
View reviewed changes
Copy link
Member

@modem7 modem7 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - Great job, sorry it took so long to check!

Only thing I'd add is: "Borgmatic v1.9.0 has just been released, shall we add that to this PR as well? This is an optional comment, and not in any way a requirement to close/merge."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@modem7 modem7 modem7 approved these changes

@grantbevis grantbevis grantbevis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Passphrase env vars with special characters no longer work with 1.8.13
3 participants
@Psycho0verload @modem7 @grantbevis