Skip to content

Commit

Permalink
Feat/update (#73)
Browse files Browse the repository at this point in the history
* ✨feature: mongo tool 100.8.0

* ✨feature: only run mongo-tool build when update mongo-tool
  • Loading branch information
maxisam committed Sep 10, 2023
1 parent fd93ff1 commit f494e1e
Show file tree
Hide file tree
Showing 9 changed files with 131 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// README at: https://github.com/devcontainers/templates/tree/main/src/go
{
"name": "Go",
"image": "mcr.microsoft.com/devcontainers/go:0-1.19-bullseye",
"image": "mcr.microsoft.com/devcontainers/go:0-1.21-bullseye",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-mongo-tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
workflow_dispatch:
pull_request:
branches: ["main"]
paths:
- mongo-tool/Dockerfile

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
version:
type: string
description: Version
default: 1.11
default: 1.12
required: false

jobs:
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
ARG MONGODB_TOOLS_VERSION=100.6.1
ARG MONGODB_TOOLS_VERSION=100.8.0
ARG EN_AWS_CLI=false
ARG AWS_CLI_VERSION=1.22.46
ARG AWS_CLI_VERSION=1.29.44
ARG EN_AZURE=false
ARG AZURE_CLI_VERSION=2.32.0
ARG AZURE_CLI_VERSION=2.52.0
ARG EN_GCLOUD=false
ARG GOOGLE_CLOUD_SDK_VERSION=370.0.0
ARG GOOGLE_CLOUD_SDK_VERSION=445.0.0
ARG EN_GPG=true
ARG GNUPG_VERSION="2.2.31-r2"
ARG GNUPG_VERSION="2.4.3-r1"
ARG EN_MINIO=false
ARG EN_RCLONE=false
ARG VERSION

FROM maxisam/mongo-tool:${MONGODB_TOOLS_VERSION} as tools-builder

FROM golang:1.19 as mgob-builder
FROM golang:1.21 as mgob-builder
ARG VERSION
COPY . /go/src/github.com/stefanprodan/mgob
WORKDIR /go/src/github.com/stefanprodan/mgob
RUN CGO_ENABLED=0 GOOS=linux go test ./pkg/... && \
CGO_ENABLED=0 GOOS=linux go build -ldflags "-X main.version=$VERSION" -a -installsuffix cgo -o mgob github.com/stefanprodan/mgob/cmd/mgob

FROM alpine:3.15
FROM alpine:3.18
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ That is why I add features to my fork only.
- Add Retry logic for backup
- Add MS Team notification support
- Use github.com/jordan-wright/email for email notification for [certificate issue](https://github.com/stefanprodan/mgob/issues/160)
- Update Go to 1.19
- Update Go to 1.21
- Update other dependencies
- Add warnOnly option to all notification channels
- Use Github Action for CI/CD
- New Helm Chart with metric & liveness prob & new features etc
- Create multiple docker image releases for different backup solution
- Skip local backup when retention = 0 [#42](https://github.com/maxisam/mgob/pull/42) Thanks @aneagoe

- Add on-demand restore API
### Helm Chart

```bash
Expand Down
2 changes: 1 addition & 1 deletion cmd/mgob/mgob.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var (
appConfig = &config.AppConfig{}
modules = &config.ModuleConfig{}
name = "mgob"
version = "v1.11.0-dev"
version = "v1.12.0-dev"
)

func beforeApp(c *cli.Context) error {
Expand Down
62 changes: 32 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,56 +1,58 @@
module github.com/stefanprodan/mgob

go 1.19
go 1.21

require (
github.com/boltdb/bolt v1.3.1
github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
github.com/dustin/go-humanize v1.0.0
github.com/go-chi/chi v1.5.4
github.com/go-chi/render v1.0.1
github.com/dustin/go-humanize v1.0.1
github.com/go-chi/chi v1.5.5
github.com/go-chi/render v1.0.3
github.com/kelseyhightower/envconfig v1.4.0
github.com/pkg/errors v0.9.1
github.com/pkg/sftp v1.13.4
github.com/prometheus/client_golang v1.13.0
github.com/pkg/sftp v1.13.6
github.com/prometheus/client_golang v1.16.0
github.com/robfig/cron v1.2.0
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.0
github.com/urfave/cli v1.22.5
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
github.com/urfave/cli v1.22.14
golang.org/x/crypto v0.13.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/ajg/form v1.5.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
golang.org/x/text v0.3.7 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/text v0.13.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

require (
github.com/atc0005/go-teams-notify/v2 v2.6.1
github.com/atc0005/go-teams-notify/v2 v2.8.0
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
github.com/kr/fs v0.1.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
go.mongodb.org/mongo-driver v1.10.2
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
google.golang.org/protobuf v1.28.1 // indirect
go.mongodb.org/mongo-driver v1.12.1
golang.org/x/sys v0.12.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)

0 comments on commit f494e1e

Please sign in to comment.