Compare commits

...

38 Commits

Author SHA1 Message Date
Frederik Ring
336e12f874 Add support for Azure storage access tiers (#452) 2024-08-09 15:37:27 +02:00
dependabot[bot]
016c6c8307 Bump golang.org/x/sync from 0.7.0 to 0.8.0 (#454) 2024-08-06 03:33:32 +00:00
dependabot[bot]
e22f317fbb Bump golang.org/x/oauth2 from 0.21.0 to 0.22.0 (#453) 2024-08-06 03:15:49 +00:00
dependabot[bot]
e04bd2f066 Bump rexml from 3.2.8 to 3.3.3 in /docs (#451) 2024-08-02 06:35:44 +00:00
Frederik Ring
c4eeaad813 Bump shoutrrr to version 0.8 (#450) 2024-07-31 21:58:24 +02:00
Frederik Ring
5840f1c5dc Update docker/docker package (#449) 2024-07-31 21:54:25 +02:00
dependabot[bot]
d71b7304c2 Bump github.com/docker/cli (#448) 2024-07-30 05:14:03 +00:00
Frederik Ring
fbc7f85d9f version key in compose file is deprecated (#445) 2024-07-23 20:47:45 +02:00
dependabot[bot]
2af5bdf4d9 Bump github.com/Azure/azure-sdk-for-go/sdk/storage/azblob from 1.2.1 to 1.4.0 (#442) 2024-07-23 18:33:13 +00:00
dependabot[bot]
631ca3e07d Bump github.com/gofrs/flock from 0.12.0 to 0.12.1 (#444) 2024-07-22 21:57:20 +00:00
dependabot[bot]
3d35d7c00e Bump github.com/minio/minio-go/v7 from 7.0.73 to 7.0.74 (#443) 2024-07-22 21:39:21 +00:00
dependabot[bot]
954bde73fb Bump github.com/docker/cli (#441) 2024-07-22 21:39:11 +00:00
dependabot[bot]
ab46e96706 Bump github.com/gofrs/flock from 0.11.0 to 0.12.0 (#439) 2024-07-09 04:21:31 +00:00
dependabot[bot]
ab4ce94534 Bump github.com/minio/minio-go/v7 from 7.0.72 to 7.0.73 (#440) 2024-07-09 04:04:26 +00:00
dependabot[bot]
e4170addb6 Bump github.com/docker/cli from 26.1.4+incompatible to 27.0.3+incompatible (#437)
* Bump github.com/docker/cli

Bumps [github.com/docker/cli](https://github.com/docker/cli) from 26.1.4+incompatible to 27.0.3+incompatible.
- [Commits](https://github.com/docker/cli/compare/v26.1.4...v27.0.3)

---
updated-dependencies:
- dependency-name: github.com/docker/cli
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update all Docker versions to 27

* Swap deprecated methods

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frederik Ring <frederik.ring@gmail.com>
2024-07-02 21:15:49 +02:00
dependabot[bot]
b8410bbdc5 Bump github.com/gofrs/flock from 0.8.1 to 0.11.0 (#438) 2024-07-02 05:21:06 +00:00
dependabot[bot]
24e1341589 Bump github.com/Azure/azure-sdk-for-go/sdk/azidentity (#435) 2024-06-25 03:41:41 +00:00
dependabot[bot]
3d0286472b Bump github.com/minio/minio-go/v7 from 7.0.71 to 7.0.72 (#434) 2024-06-25 03:41:21 +00:00
dependabot[bot]
bb11ae035b Bump github.com/klauspost/compress from 1.17.8 to 1.17.9 (#431) 2024-06-18 05:09:55 +00:00
dependabot[bot]
9209037ed9 Bump github.com/Azure/azure-sdk-for-go/sdk/azidentity (#430) 2024-06-11 20:45:47 +00:00
dependabot[bot]
2e73dea4f7 Bump github.com/docker/cli (#428) 2024-06-11 05:57:25 +00:00
dependabot[bot]
7dc3ae17e7 Bump github.com/minio/minio-go/v7 from 7.0.70 to 7.0.71 (#427) 2024-06-11 05:57:06 +00:00
dependabot[bot]
9d5ea718a0 Bump golang.org/x/oauth2 from 0.20.0 to 0.21.0 (#426) 2024-06-11 05:56:37 +00:00
dependabot[bot]
272495ae7d Bump alpine from 3.19 to 3.20 (#424) 2024-05-28 04:45:31 +00:00
Frederik Ring
8beb28d4f8 Documentation should mention label visibility restrictions 2024-05-26 10:28:46 +02:00
dependabot[bot]
0ec2e68076 --- (#421) 2024-05-21 04:51:09 +00:00
dependabot[bot]
b85afa6008 Bump rexml from 3.2.6 to 3.2.8 in /docs (#420) 2024-05-17 11:04:07 +00:00
guangwu
4cb47a4818 fix: close backup file (#419) 2024-05-16 09:35:28 +02:00
dependabot[bot]
9b5ba8958d Bump github.com/docker/cli (#418) 2024-05-14 04:37:36 +00:00
dependabot[bot]
0327701e2d Bump golang.org/x/oauth2 from 0.19.0 to 0.20.0 (#416) 2024-05-07 04:13:27 +00:00
dependabot[bot]
58f26ba004 Bump github.com/docker/cli (#415) 2024-05-07 04:12:59 +00:00
dependabot[bot]
f62ef6e05a Bump github.com/minio/minio-go/v7 from 7.0.69 to 7.0.70 (#414) 2024-04-30 11:08:13 +00:00
Frederik Ring
40924434e4 Use up to date version of golangci-lint (#413) 2024-04-26 17:48:00 +02:00
Frederik Ring
e613f6046f Fix issues raised by linter 2024-04-26 17:10:06 +02:00
dependabot[bot]
292d47eb19 Bump github.com/docker/cli from 24.0.9+incompatible to 26.1.0+incompatible (#411)
* Bump github.com/docker/cli

Bumps [github.com/docker/cli](https://github.com/docker/cli) from 24.0.9+incompatible to 26.1.0+incompatible.
- [Commits](https://github.com/docker/cli/compare/v24.0.9...v26.1.0)

---
updated-dependencies:
- dependency-name: github.com/docker/cli
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Upgrade docker/docker to matching version

* Tidy go.mod

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frederik Ring <frederik.ring@gmail.com>
2024-04-25 17:33:07 +02:00
dependabot[bot]
7637975e3f Bump golang.org/x/net from 0.22.0 to 0.23.0 (#410) 2024-04-19 13:37:08 +00:00
dependabot[bot]
c47a14c53a Bump github.com/Azure/azure-sdk-for-go/sdk/azidentity (#408) 2024-04-16 11:21:42 +00:00
dependabot[bot]
9f795761d6 Bump github.com/klauspost/compress from 1.17.7 to 1.17.8 (#409) 2024-04-16 11:21:21 +00:00
42 changed files with 216 additions and 897 deletions

View File

@@ -26,7 +26,7 @@ jobs:
# Require: The version of golangci-lint to use.
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
version: v1.54
version: v1.57
# Optional: working directory, useful for monorepos
# working-directory: somedir

View File

@@ -9,7 +9,7 @@ RUN go mod download
WORKDIR /app/cmd/backup
RUN go build -o backup .
FROM alpine:3.19
FROM alpine:3.20
WORKDIR /root

View File

@@ -22,8 +22,7 @@ import (
)
func createArchive(files []string, inputFilePath, outputFilePath string, compression string, compressionConcurrency int) error {
inputFilePath = stripTrailingSlashes(inputFilePath)
inputFilePath, outputFilePath, err := makeAbsolute(inputFilePath, outputFilePath)
_, outputFilePath, err := makeAbsolute(stripTrailingSlashes(inputFilePath), outputFilePath)
if err != nil {
return errwrap.Wrap(err, "error transposing given file paths")
}
@@ -31,7 +30,7 @@ func createArchive(files []string, inputFilePath, outputFilePath string, compres
return errwrap.Wrap(err, "error creating output file path")
}
if err := compress(files, outputFilePath, filepath.Dir(inputFilePath), compression, compressionConcurrency); err != nil {
if err := compress(files, outputFilePath, compression, compressionConcurrency); err != nil {
return errwrap.Wrap(err, "error creating archive")
}
@@ -55,7 +54,7 @@ func makeAbsolute(inputFilePath, outputFilePath string) (string, string, error)
return inputFilePath, outputFilePath, err
}
func compress(paths []string, outFilePath, subPath string, algo string, concurrency int) error {
func compress(paths []string, outFilePath, algo string, concurrency int) error {
file, err := os.Create(outFilePath)
if err != nil {
return errwrap.Wrap(err, "error creating out file")

View File

@@ -131,13 +131,9 @@ func (c *command) schedule(strategy configStrategy) error {
c.logger.Warn(
fmt.Sprintf("Scheduled cron expression %s will never run, is this intentional?", config.BackupCronExpression),
)
if err != nil {
return errwrap.Wrap(err, "error scheduling")
}
c.schedules = append(c.schedules, id)
}
}
return nil
}

View File

@@ -76,6 +76,7 @@ type Config struct {
AzureStorageContainerName string `split_words:"true"`
AzureStoragePath string `split_words:"true"`
AzureStorageEndpoint string `split_words:"true" default:"https://{{ .AccountName }}.blob.core.windows.net/"`
AzureStorageAccessTier string `split_words:"true"`
DropboxEndpoint string `split_words:"true" default:"https://api.dropbox.com/"`
DropboxOAuth2Endpoint string `envconfig:"DROPBOX_OAUTH2_ENDPOINT" default:"https://api.dropbox.com/"`
DropboxRefreshToken string `split_words:"true"`

View File

@@ -51,6 +51,7 @@ func (s *script) encryptArchive() error {
if err != nil {
return errwrap.Wrap(err, fmt.Sprintf("error opening backup file `%s`", s.file))
}
defer src.Close()
if _, err := io.Copy(dst, src); err != nil {
return errwrap.Wrap(err, "error writing ciphertext to file")

View File

@@ -16,7 +16,7 @@ import (
"strings"
"github.com/cosiner/argv"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/pkg/stdcopy"
"github.com/offen/docker-volume-backup/internal/errwrap"
@@ -28,7 +28,7 @@ func (s *script) exec(containerRef string, command string, user string) ([]byte,
commandEnv := []string{
fmt.Sprintf("COMMAND_RUNTIME_ARCHIVE_FILEPATH=%s", s.file),
}
execID, err := s.cli.ContainerExecCreate(context.Background(), containerRef, types.ExecConfig{
execID, err := s.cli.ContainerExecCreate(context.Background(), containerRef, container.ExecOptions{
Cmd: args[0],
AttachStdin: true,
AttachStderr: true,
@@ -39,7 +39,7 @@ func (s *script) exec(containerRef string, command string, user string) ([]byte,
return nil, nil, errwrap.Wrap(err, "error creating container exec")
}
resp, err := s.cli.ContainerExecAttach(context.Background(), execID.ID, types.ExecStartCheck{})
resp, err := s.cli.ContainerExecAttach(context.Background(), execID.ID, container.ExecStartOptions{})
if err != nil {
return nil, nil, errwrap.Wrap(err, "error attaching container exec")
}
@@ -96,7 +96,7 @@ func (s *script) runLabeledCommands(label string) error {
Value: fmt.Sprintf("docker-volume-backup.exec-label=%s", s.c.ExecLabel),
})
}
containersWithCommand, err := s.cli.ContainerList(context.Background(), types.ContainerListOptions{
containersWithCommand, err := s.cli.ContainerList(context.Background(), container.ListOptions{
Filters: filters.NewArgs(f...),
})
if err != nil {
@@ -109,7 +109,7 @@ func (s *script) runLabeledCommands(label string) error {
Key: "label",
Value: "docker-volume-backup.exec-pre",
}
deprecatedContainers, err := s.cli.ContainerList(context.Background(), types.ContainerListOptions{
deprecatedContainers, err := s.cli.ContainerList(context.Background(), container.ListOptions{
Filters: filters.NewArgs(f...),
})
if err != nil {
@@ -126,7 +126,7 @@ func (s *script) runLabeledCommands(label string) error {
Key: "label",
Value: "docker-volume-backup.exec-post",
}
deprecatedContainers, err := s.cli.ContainerList(context.Background(), types.ContainerListOptions{
deprecatedContainers, err := s.cli.ContainerList(context.Background(), container.ListOptions{
Filters: filters.NewArgs(f...),
})
if err != nil {

View File

@@ -194,6 +194,7 @@ func (s *script) init() error {
Endpoint: s.c.AzureStorageEndpoint,
RemotePath: s.c.AzureStoragePath,
ConnectionString: s.c.AzureStorageConnectionString,
AccessTier: s.c.AzureStorageAccessTier,
}
azureBackend, err := azure.NewStorageBackend(azureConfig, logFunc)
if err != nil {

View File

@@ -14,9 +14,11 @@ import (
"github.com/docker/cli/cli/command/service/progress"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
ctr "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/api/types/system"
"github.com/docker/docker/client"
"github.com/offen/docker-volume-backup/internal/errwrap"
)
@@ -65,7 +67,7 @@ func awaitContainerCountForService(cli *client.Client, serviceID string, count i
),
)
case <-poll.C:
containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{
containers, err := cli.ContainerList(context.Background(), container.ListOptions{
Filters: filters.NewArgs(filters.KeyValuePair{
Key: "label",
Value: fmt.Sprintf("com.docker.swarm.service.id=%s", serviceID),
@@ -82,7 +84,7 @@ func awaitContainerCountForService(cli *client.Client, serviceID string, count i
}
func isSwarm(c interface {
Info(context.Context) (types.Info, error)
Info(context.Context) (system.Info, error)
}) (bool, error) {
info, err := c.Info(context.Background())
if err != nil {
@@ -123,11 +125,11 @@ func (s *script) stopContainersAndServices() (func() error, error) {
labelValue,
)
allContainers, err := s.cli.ContainerList(context.Background(), types.ContainerListOptions{})
allContainers, err := s.cli.ContainerList(context.Background(), container.ListOptions{})
if err != nil {
return noop, errwrap.Wrap(err, "error querying for containers")
}
containersToStop, err := s.cli.ContainerList(context.Background(), types.ContainerListOptions{
containersToStop, err := s.cli.ContainerList(context.Background(), container.ListOptions{
Filters: filters.NewArgs(filters.KeyValuePair{
Key: "label",
Value: filterMatchLabel,
@@ -309,7 +311,7 @@ func (s *script) stopContainersAndServices() (func() error, error) {
continue
}
if err := s.cli.ContainerStart(context.Background(), container.ID, types.ContainerStartOptions{}); err != nil {
if err := s.cli.ContainerStart(context.Background(), container.ID, ctr.StartOptions{}); err != nil {
restartErrors = append(restartErrors, err)
}
}

View File

@@ -5,16 +5,16 @@ import (
"errors"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/api/types/system"
)
type mockInfoClient struct {
result types.Info
result system.Info
err error
}
func (m *mockInfoClient) Info(context.Context) (types.Info, error) {
func (m *mockInfoClient) Info(context.Context) (system.Info, error) {
return m.result, m.err
}
@@ -28,7 +28,7 @@ func TestIsSwarm(t *testing.T) {
{
"swarm",
&mockInfoClient{
result: types.Info{
result: system.Info{
Swarm: swarm.Info{
LocalNodeState: swarm.LocalNodeStateActive,
},
@@ -40,7 +40,7 @@ func TestIsSwarm(t *testing.T) {
{
"compose",
&mockInfoClient{
result: types.Info{
result: system.Info{
Swarm: swarm.Info{
LocalNodeState: swarm.LocalNodeStateInactive,
},
@@ -52,7 +52,7 @@ func TestIsSwarm(t *testing.T) {
{
"balena",
&mockInfoClient{
result: types.Info{
result: system.Info{
Swarm: swarm.Info{
LocalNodeState: "",
},

View File

@@ -59,11 +59,13 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rexml (3.3.3)
strscan
rouge (3.30.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
strscan (3.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.4.2)

View File

@@ -9,6 +9,11 @@ parent: How Tos
In certain scenarios it can be required to run specific commands before and after a backup is taken (e.g. dumping a database).
When mounting the Docker socket into the `docker-volume-backup` container, you can define pre- and post-commands that will be run in the context of the target container (it is also possible to run commands inside the `docker-volume-backup` container itself using this feature).
{: .important }
In a multi-node Swarm setup, commands can currently only be run on the node the `offen/docker-volume-backup` container is running on.
Labeled containers on other nodes are not visible to the backup command.
Such commands are defined by specifying the command in a `docker-volume-backup.[step]-[pre|post]` label where `step` can be any of the following phases of a backup lifecycle:
- `archive` (the tar archive is created)

View File

@@ -25,7 +25,7 @@ services:
Notification backends other than email are also supported.
Refer to the documentation of [shoutrrr][shoutrrr-docs] to find out about options and configuration.
[shoutrrr-docs]: https://containrrr.dev/shoutrrr/0.7/services/overview/
[shoutrrr-docs]: https://containrrr.dev/shoutrrr/v0.8/services/overview/
{: .note }
If you also want notifications on successful executions, set `NOTIFICATION_LEVEL` to `info`.

View File

@@ -269,6 +269,11 @@ You can populate below template according to your requirements and use it as you
# Note: Use your app's subpath in Dropbox, if it doesn't have global access.
# Consulte the README for further information.
# The access tier when using Azure Blob Storage. Possible values are
# https://github.com/Azure/azure-sdk-for-go/blob/sdk/storage/azblob/v1.3.2/sdk/storage/azblob/internal/generated/zz_constants.go#L14-L30
# AZURE_STORAGE_ACCESS_TIER="Cold"
# DROPBOX_REMOTE_PATH="/my/directory"
# Number of concurrent chunked uploads for Dropbox.
@@ -378,7 +383,7 @@ You can populate below template according to your requirements and use it as you
# Notifications (email, Slack, etc.) can be sent out when a backup run finishes.
# Configuration is provided as a comma-separated list of URLs as consumed
# by `shoutrrr`: https://containrrr.dev/shoutrrr/0.7/services/overview/
# by `shoutrrr`: https://containrrr.dev/shoutrrr/v0.8/services/overview/
# The content of such notifications can be customized. Dedicated documentation
# on how to do this can be found in the README. When providing multiple URLs or
# an URL that contains a comma, the values can be URL encoded to avoid ambiguities.

69
go.mod
View File

@@ -3,75 +3,82 @@ module github.com/offen/docker-volume-backup
go 1.22
require (
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1
github.com/containrrr/shoutrrr v0.7.1
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0
github.com/containrrr/shoutrrr v0.8.0
github.com/cosiner/argv v0.1.0
github.com/docker/cli v24.0.9+incompatible
github.com/docker/docker v24.0.7+incompatible
github.com/gofrs/flock v0.8.1
github.com/docker/cli v27.1.1+incompatible
github.com/docker/docker v27.1.1+incompatible
github.com/gofrs/flock v0.12.1
github.com/joho/godotenv v1.5.1
github.com/klauspost/compress v1.17.7
github.com/klauspost/compress v1.17.9
github.com/leekchan/timeutil v0.0.0-20150802142658-28917288c48d
github.com/minio/minio-go/v7 v7.0.69
github.com/minio/minio-go/v7 v7.0.74
github.com/offen/envconfig v1.5.0
github.com/otiai10/copy v1.14.0
github.com/pkg/sftp v1.13.6
github.com/robfig/cron/v3 v3.0.1
github.com/studio-b12/gowebdav v0.9.0
golang.org/x/crypto v0.21.0
golang.org/x/oauth2 v0.19.0
golang.org/x/sync v0.7.0
golang.org/x/crypto v0.25.0
golang.org/x/oauth2 v0.22.0
golang.org/x/sync v0.8.0
mvdan.cc/sh/v3 v3.8.0
)
require (
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
)
require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.1
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/klauspost/pgzip v1.2.6
github.com/kr/fs v0.1.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/moby/term v0.0.0-20200312100748-672ec06f55cd // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rs/xid v1.5.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
gotest.tools/v3 v3.0.3 // indirect
)

885
go.sum

File diff suppressed because it is too large Load Diff

View File

@@ -17,6 +17,8 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
"github.com/offen/docker-volume-backup/internal/errwrap"
"github.com/offen/docker-volume-backup/internal/storage"
@@ -25,6 +27,7 @@ import (
type azureBlobStorage struct {
*storage.StorageBackend
client *azblob.Client
uploadStreamOptions *blockblob.UploadStreamOptions
containerName string
}
@@ -36,6 +39,7 @@ type Config struct {
ConnectionString string
Endpoint string
RemotePath string
AccessTier string
}
// NewStorageBackend creates and initializes a new Azure Blob Storage backend.
@@ -81,8 +85,25 @@ func NewStorageBackend(opts Config, logFunc storage.Log) (storage.Backend, error
}
}
var uploadStreamOptions *blockblob.UploadStreamOptions
if opts.AccessTier != "" {
var found bool
for _, t := range blob.PossibleAccessTierValues() {
if string(t) == opts.AccessTier {
found = true
uploadStreamOptions = &blockblob.UploadStreamOptions{
AccessTier: &t,
}
}
}
if !found {
return nil, errwrap.Wrap(nil, fmt.Sprintf("%s is not a possible access tier value", opts.AccessTier))
}
}
storage := azureBlobStorage{
client: client,
uploadStreamOptions: uploadStreamOptions,
containerName: opts.ContainerName,
StorageBackend: &storage.StorageBackend{
DestinationPath: opts.RemotePath,
@@ -103,12 +124,13 @@ func (b *azureBlobStorage) Copy(file string) error {
if err != nil {
return errwrap.Wrap(err, fmt.Sprintf("error opening file %s", file))
}
_, err = b.client.UploadStream(
context.Background(),
b.containerName,
filepath.Join(b.DestinationPath, filepath.Base(file)),
fileReader,
nil,
b.uploadStreamOptions,
)
if err != nil {
return errwrap.Wrap(err, fmt.Sprintf("error uploading file %s", file))

View File

@@ -1,4 +1,4 @@
FROM docker:26-dind
FROM docker:27-dind
RUN apk add \
coreutils \

View File

@@ -1,8 +1,6 @@
version: '3'
services:
storage:
image: mcr.microsoft.com/azure-storage/azurite:3.26.0
image: mcr.microsoft.com/azure-storage/azurite:3.31.0
volumes:
- ${DATA_DIR:-./data}:/data
command: azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --location /data
@@ -36,6 +34,7 @@ services:
AZURE_STORAGE_CONTAINER_NAME: test-container
AZURE_STORAGE_ENDPOINT: http://storage:10000/{{ .AccountName }}/
AZURE_STORAGE_PATH: 'path/to/backup'
AZURE_STORAGE_ACCESS_TIER: Hot
BACKUP_FILENAME: test.tar.gz
BACKUP_CRON_EXPRESSION: 0 0 5 31 2 ?
BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-7}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
minio:
hostname: minio.local

View File

@@ -1,8 +1,6 @@
# Copyright 2020-2021 - offen.software <hioffen@posteo.de>
# SPDX-License-Identifier: Unlicense
version: '3.8'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3.8'
services:
database:
image: mariadb:10.7

View File

@@ -1,5 +1,3 @@
version: '3'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
openapi_mock:
image: muonsoft/openapi-mock:0.3.9

View File

@@ -1,5 +1,3 @@
version: '3'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3.8'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
minio:
image: minio/minio:RELEASE.2020-08-04T23-10-51Z

View File

@@ -1,5 +1,3 @@
version: '3'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
db:
image: postgres:14-alpine

View File

@@ -1,8 +1,6 @@
# Copyright 2020-2021 - offen.software <hioffen@posteo.de>
# SPDX-License-Identifier: Unlicense
version: '3.8'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,8 +1,6 @@
# Copyright 2020-2021 - offen.software <hioffen@posteo.de>
# SPDX-License-Identifier: Unlicense
version: '3.8'
services:
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}

View File

@@ -1,5 +1,3 @@
version: '3'
services:
minio:
image: minio/minio:RELEASE.2020-08-04T23-10-51Z

View File

@@ -1,5 +1,3 @@
version: '3'
services:
minio:
image: minio/minio:RELEASE.2020-08-04T23-10-51Z

View File

@@ -1,8 +1,6 @@
# Copyright 2020-2021 - offen.software <hioffen@posteo.de>
# SPDX-License-Identifier: Unlicense
version: '3.8'
services:
minio:
image: minio/minio:RELEASE.2020-08-04T23-10-51Z

View File

@@ -1,8 +1,6 @@
# Copyright 2020-2021 - offen.software <hioffen@posteo.de>
# SPDX-License-Identifier: Unlicense
version: '3.8'
services:
minio:
image: minio/minio:RELEASE.2020-08-04T23-10-51Z

View File

@@ -1,5 +1,3 @@
version: '3'
services:
ssh:
image: linuxserver/openssh-server:version-8.6_p1-r3

View File

@@ -1,8 +1,6 @@
# Copyright 2020-2021 - offen.software <hioffen@posteo.de>
# SPDX-License-Identifier: Unlicense
version: '3.8'
services:
minio:
image: minio/minio:RELEASE.2020-08-04T23-10-51Z

View File

@@ -1,5 +1,3 @@
version: '2.4'
services:
alpine:
image: alpine:3.17.3

View File

@@ -1,5 +1,3 @@
version: '3'
services:
webdav:
image: bytemark/webdav:2.4