Skip to content

Commit 7f22bde

Browse files
030030
authored
Merge pull request #380 from 030/dependencies-updater-bot
Update dependencies
2 parents 057ae4c + 8f07503 commit 7f22bde

File tree

11 files changed

+41
-37
lines changed

11 files changed

+41
-37
lines changed

‎.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464
docker run --rm -v ${PWD}:/data markdownlint/markdownlint:0.11.0 \
6565
README.md -s /data/configs/.markdownlint.rb
6666
docker run --rm -v $(pwd):/app -w /app -e GOFLAGS=-buildvcs=false \
67-
golangci/golangci-lint:v1.53.3-alpine golangci-lint run -v \
67+
golangci/golangci-lint:v1.54.2-alpine golangci-lint run -v \
6868
--timeout 2m30s --config configs/.golangci.yml
6969
if: ${{ startsWith(matrix.os, 'ubuntu') }}

‎.github/workflows/gosec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Download gosec
1616
run: |
1717
export GOSEC_URL=https://github.com/securego/gosec/releases/download
18-
export GOSEC_VERSION=2.16.0
18+
export GOSEC_VERSION=2.17.0
1919
export GOSEC=${GOSEC_URL}/v${GOSEC_VERSION}/gosec_${GOSEC_VERSION}
2020
curl -L ${GOSEC}_linux_amd64.tar.gz -o gosec.tar.gz
2121
tar -xvf gosec.tar.gz

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20.6-alpine3.18 as builder
1+
FROM golang:1.21.0-alpine3.18 as builder
22
ARG VERSION
33
ENV USERNAME n3dr
44
RUN adduser -D -g '' $USERNAME
@@ -9,7 +9,7 @@ RUN apk add --no-cache \
99
CGO_ENABLED=0 go build -ldflags "-X main.Version=${VERSION}" -buildvcs=false && \
1010
cp n3dr /n3dr
1111

12-
FROM alpine:3.18.2
12+
FROM alpine:3.18.3
1313
COPY --from=builder /etc/passwd /etc/passwd
1414
COPY --from=builder /n3dr /usr/local/bin/n3dr
1515
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

‎build/package/snap/snapcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: n3dr
33
base: core20
4-
version: 7.2.4
4+
version: 7.2.5
55
summary: Nexus3 Disaster Recovery
66
description: |
77
Download all artifacts at once or migrate automatically from Nexus to Nexus.

‎docs/CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
## [Unreleased]
33

44

5-
<a name="7.2.4"></a>
6-
## [7.2.4] - 2023-07-25
5+
<a name="7.2.5"></a>
6+
## [7.2.5] - 2023-08-25
77
### Build
88
- **deps:** Update versions.
99

1010

11+
<a name="7.2.4"></a>
12+
## [7.2.4] - 2023-07-27
13+
1114
<a name="7.2.3"></a>
1215
## [7.2.3] - 2023-07-01
1316
### Feat
@@ -382,7 +385,8 @@ The `backup`, `upload` and `repositories` commands have been removed.
382385
<a name="1.0.0"></a>
383386
## 1.0.0 - 2019-05-12
384387

385-
[Unreleased]: https://github.com/030/n3dr/compare/7.2.4...HEAD
388+
[Unreleased]: https://github.com/030/n3dr/compare/7.2.5...HEAD
389+
[7.2.5]: https://github.com/030/n3dr/compare/7.2.4...7.2.5
386390
[7.2.4]: https://github.com/030/n3dr/compare/7.2.3...7.2.4
387391
[7.2.3]: https://github.com/030/n3dr/compare/7.2.2...7.2.3
388392
[7.2.2]: https://github.com/030/n3dr/compare/7.2.1...7.2.2

‎docs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ n3dr config \
238238
### Build
239239

240240
```bash
241-
docker build -t utrecht/n3dr:7.2.4 .
241+
docker build -t utrecht/n3dr:7.2.5 .
242242
```
243243

244244
[![dockeri.co](https://dockeri.co/image/utrecht/n3dr)](https://hub.docker.com/r/utrecht/n3dr)
@@ -248,7 +248,7 @@ docker build -t utrecht/n3dr:7.2.4 .
248248
```bash
249249
docker run -it \
250250
-v /home/${USER}/.n3dr:/root/.n3dr \
251-
-v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.2.4
251+
-v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.2.5
252252
```
253253

254254
### Upload
@@ -257,7 +257,7 @@ docker run -it \
257257
docker run -it \
258258
--entrypoint=/bin/ash \
259259
-v /home/${USER}/.n3dr:/root/.n3dr \
260-
-v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.2.4
260+
-v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.2.5
261261
```
262262

263263
navigate to the repository folder, e.g. `/tmp/n3dr/download*/` and upload:

‎docs/quickstarts/snippets/n3dr/DOWNLOAD.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Download
22

3-
Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.2.4):
3+
Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.2.5):
44

55
```bash
66
cd /tmp && \
7-
curl -L https://github.com/030/n3dr/releases/download/7.2.4/n3dr-ubuntu-latest \
7+
curl -L https://github.com/030/n3dr/releases/download/7.2.5/n3dr-ubuntu-latest \
88
-o n3dr-ubuntu-latest && \
9-
curl -L https://github.com/030/n3dr/releases/download/7.2.4/\
9+
curl -L https://github.com/030/n3dr/releases/download/7.2.5/\
1010
n3dr-ubuntu-latest.sha512.txt \
1111
-o n3dr-ubuntu-latest.sha512.txt && \
1212
sha512sum -c n3dr-ubuntu-latest.sha512.txt && \

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/030/logging v0.1.2
77
github.com/030/mij v1.0.2
88
github.com/030/p2iwd v1.0.3
9-
github.com/aws/aws-sdk-go v1.44.308
9+
github.com/aws/aws-sdk-go v1.44.332
1010
github.com/go-openapi/errors v0.20.4
1111
github.com/go-openapi/runtime v0.26.0
1212
github.com/go-openapi/strfmt v0.21.7
@@ -20,7 +20,7 @@ require (
2020
github.com/spf13/cobra v1.7.0
2121
github.com/spf13/viper v1.16.0
2222
github.com/stretchr/testify v1.8.4
23-
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090
23+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
2424
)
2525

2626
require (
@@ -65,20 +65,20 @@ require (
6565
github.com/spf13/cast v1.5.1 // indirect
6666
github.com/spf13/jwalterweatherman v1.1.0 // indirect
6767
github.com/spf13/pflag v1.0.5 // indirect
68-
github.com/subosito/gotenv v1.4.2 // indirect
68+
github.com/subosito/gotenv v1.6.0 // indirect
6969
github.com/therootcompany/xz v1.0.1 // indirect
70-
github.com/tidwall/gjson v1.14.4 // indirect
70+
github.com/tidwall/gjson v1.16.0 // indirect
7171
github.com/tidwall/match v1.1.1 // indirect
7272
github.com/tidwall/pretty v1.2.1 // indirect
7373
github.com/ulikunitz/xz v0.5.11 // indirect
7474
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
75-
go.mongodb.org/mongo-driver v1.12.0 // indirect
75+
go.mongodb.org/mongo-driver v1.12.1 // indirect
7676
go.opentelemetry.io/otel v1.16.0 // indirect
7777
go.opentelemetry.io/otel/metric v1.16.0 // indirect
7878
go.opentelemetry.io/otel/trace v1.16.0 // indirect
7979
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
80-
golang.org/x/sys v0.10.0 // indirect
81-
golang.org/x/text v0.11.0 // indirect
80+
golang.org/x/sys v0.11.0 // indirect
81+
golang.org/x/text v0.12.0 // indirect
8282
gopkg.in/ini.v1 v1.67.0 // indirect
8383
gopkg.in/yaml.v2 v2.4.0 // indirect
8484
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG
5151
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
5252
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
5353
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
54-
github.com/aws/aws-sdk-go v1.44.308 h1:XKu+76UHsD5LaiU2Zb1q42uWakw80Az7x39jJXXahos=
55-
github.com/aws/aws-sdk-go v1.44.308/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
54+
github.com/aws/aws-sdk-go v1.44.332 h1:Ze+98F41+LxoJUdsisAFThV+0yYYLYw17/Vt0++nFYM=
55+
github.com/aws/aws-sdk-go v1.44.332/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
5656
github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
5757
github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs=
5858
github.com/bodgit/sevenzip v1.4.3 h1:46Rb9vCYdpceC1U+GIR0bS3hP2/Xv8coKFDeLJySV/A=
@@ -356,12 +356,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
356356
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
357357
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
358358
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
359-
github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
360-
github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
359+
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
360+
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
361361
github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
362362
github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
363-
github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
364-
github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
363+
github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=
364+
github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
365365
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
366366
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
367367
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -389,8 +389,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
389389
go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
390390
go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
391391
go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
392-
go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE=
393-
go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0=
392+
go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE=
393+
go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
394394
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
395395
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
396396
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -428,8 +428,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
428428
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
429429
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
430430
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
431-
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 h1:Di6/M8l0O2lCLc6VVRWhgCiApHV8MnQurBnFSHsQtNY=
432-
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
431+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
432+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
433433
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
434434
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
435435
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -560,8 +560,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
560560
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
561561
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
562562
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
563-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
564-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
563+
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
564+
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
565565
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
566566
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
567567
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -578,8 +578,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
578578
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
579579
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
580580
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
581-
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
582-
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
581+
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
582+
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
583583
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
584584
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
585585
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎internal/app/n3dr/n3drtest/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func Image(port int) mij.DockerImage {
5252
Name: "sonatype/nexus3",
5353
PortExternal: port,
5454
PortInternal: 8081,
55-
Version: "3.58.1",
55+
Version: "3.59.0",
5656
ContainerName: "nexus" + strconv.Itoa(port),
5757
LogFile: "/nexus-data/log/nexus.log",
5858
LogFileStringHealthCheck: "Started Sonatype Nexus OSS",

0 commit comments

Comments
 (0)