Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolaasuni
nicolaasuni committed Jul 12, 2024
1 parent 51dad2d commit 836848e
Show file tree
Hide file tree
Showing 4 changed files with 334 additions and 318 deletions.
30 changes: 20 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,51 +215,47 @@ DOCKER_REGISTRY_PUSH=

# Command used to login into the Docker pull repository
# Example: "aws --profile MYENVPROFILE ecr get-login --no-include-email --region ${AWS_REGION} | sed 's|https://||'"
DOCKER_LOGIN_PULL="echo skip"
DOCKER_LOGIN_PULL="echo"

# Command used to login into the Docker push repository
# Example: "aws --profile MYENVPROFILE ecr get-login --no-include-email --region ${AWS_REGION} | sed 's|https://||'"
DOCKER_LOGIN_PUSH="echo skip"
DOCKER_LOGIN_PUSH="echo"

# INT - integration environment via docker-compose
ifeq ($(DEPLOY_ENV), int)
#ECR_PROFILE=
DOCKER_REGISTRY=${DOCKER_REGISTRY_DEV}
#DOCKER_REGISTRY_PULL=
#DOCKER_REGISTRY_PUSH=
#DOCKER_LOGIN_PULL=
#DOCKER_LOGIN_PUSH=
RPISTAT_MONITORING_URL=http://rpistat:65501
API_TEST_FILE=*.yaml
endif

# Development environment
ifeq ($(DEPLOY_ENV), dev)
#ECR_PROFILE=
DOCKER_REGISTRY=${DOCKER_REGISTRY_DEV}
#DOCKER_REGISTRY_PULL=
DOCKER_REGISTRY_PUSH=${DOCKER_REGISTRY_DEV}
#DOCKER_LOGIN_PULL=
#DOCKER_LOGIN_PUSH=
RPISTAT_MONITORING_URL=http://rpistat:65501
API_TEST_FILE=*.yaml
endif

# QA environment
ifeq ($(DEPLOY_ENV), qa)
#ECR_PROFILE=
DOCKER_REGISTRY=${DOCKER_REGISTRY_QA}
DOCKER_REGISTRY_PULL=${DOCKER_REGISTRY_DEV}
DOCKER_REGISTRY_PUSH=${DOCKER_REGISTRY_QA}
#DOCKER_LOGIN_PULL=
#DOCKER_LOGIN_PUSH=
RPISTAT_MONITORING_URL=http://rpistat:65501
endif

# Production environment
ifeq ($(DEPLOY_ENV), prod)
#ECR_PROFILE=
DOCKER_REGISTRY=${DOCKER_REGISTRY_PROD}
DOCKER_REGISTRY_PULL=${DOCKER_REGISTRY_QA}
DOCKER_REGISTRY_PUSH=${DOCKER_REGISTRY_PROD}
#DOCKER_LOGIN_PULL=
#DOCKER_LOGIN_PUSH=
RPISTAT_MONITORING_URL=http://rpistat:65501
API_TEST_FILE=*.yaml
endif
Expand Down Expand Up @@ -438,6 +434,20 @@ endif
$(MAKE) installssl DESTDIR=$(PATHDOCKERPKG)
cp resources/docker/Dockerfile.run $(PATHDOCKERPKG)/Dockerfile

# Login into Docker AWS ECR
.PHONY: ecrlogin
ecrlogin:
ifeq ($(ECR_REGISTRY),)
# skip login
else
# check the main version of aws-cli
ifeq ($(shell aws --version 2>&1 | cut -d " " -f1 | cut -d "/" -f2 | cut -d "." -f1), 1)
$(shell aws $(ECR_PROFILE) ecr get-login --no-include-email --region $(AWS_DEFAULT_REGION) | sed 's|https://||')
else
aws $(ECR_PROFILE) ecr get-login-password --region $(AWS_DEFAULT_REGION) | $(DOCKER) login --password-stdin --username AWS $(ECR_REGISTRY)
endif
endif

# Promote docker image from DEV to PROD
.PHONY: dockerpromote
dockerpromote:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.19
3.0.20
38 changes: 19 additions & 19 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ module github.com/tecnickcom/rpistat

go 1.22

toolchain go1.22.4
toolchain go1.22.5

require (
github.com/Vonage/gosrvlib v1.93.1
github.com/Vonage/gosrvlib v1.96.0
github.com/golang/mock v1.6.0
github.com/jstemmer/go-junit-report/v2 v2.1.0
github.com/prometheus/client_golang v1.19.1
Expand All @@ -14,16 +14,16 @@ require (
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.21.0
golang.org/x/sys v0.22.0
)

require (
cloud.google.com/go v0.115.0 // indirect
cloud.google.com/go/auth v0.6.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/compute/metadata v0.4.0 // indirect
cloud.google.com/go/auth v0.7.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/firestore v1.15.0 // indirect
cloud.google.com/go/longrunning v0.5.9 // indirect
cloud.google.com/go/longrunning v0.5.10 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand All @@ -46,7 +46,7 @@ require (
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
github.com/hashicorp/consul/api v1.29.1 // indirect
github.com/hashicorp/consul/api v1.29.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
Expand Down Expand Up @@ -91,25 +91,25 @@ require (
go.etcd.io/etcd/client/v2 v2.305.14 // indirect
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/api v0.187.0 // indirect
google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/api v0.188.0 // indirect
google.golang.org/genproto v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading

0 comments on commit 836848e

Please sign in to comment.