diff --git a/Dockerfile b/Dockerfile index 687c24d3cd357872a15fedcbcbff2d1812bc1931..650d674c253401a8efe06cacd6a33efc8b6bb17d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.19.0-buster as builder WORKDIR / RUN apt-get update && apt-get install unzip -RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip -RUN unzip protoc-3.19.4-linux-x86_64.zip -d / +RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.20.3/protoc-3.20.3-linux-x86_64.zip +RUN unzip protoc-3.20.3-linux-x86_64.zip -d / WORKDIR /build COPY api/ api COPY pkg/ pkg diff --git a/build_and_publish.sh b/build_and_publish.sh index 123d23dd1da3509fe708d42afa676e2d65cef1fa..b3efb8ee3b2262f7177de6c7f21bd1036df618a5 100755 --- a/build_and_publish.sh +++ b/build_and_publish.sh @@ -1,6 +1,6 @@ #!/bin/bash -TAG=1.5.1 +TAG=1.5.3 WHAT=janitor sudo docker build --rm -t artifactory.software.geant.org/nmaas-docker-local/nmaas-$WHAT:$TAG . sudo docker push artifactory.software.geant.org/nmaas-docker-local/nmaas-$WHAT:$TAG diff --git a/go.mod b/go.mod index 4fe1cf963de826bbaa6ac4af2c5ff5e11de939ba..b2ed23241a4c511d83714be087e6e346430c6955 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor require ( - github.com/golang/protobuf v1.5.2 + github.com/golang/protobuf v1.5.3 github.com/johnaoss/htpasswd v0.0.0-20190120213328-a0cc59f788da - github.com/xanzy/go-gitlab v0.73.1 - golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 - google.golang.org/grpc v1.49.0 - google.golang.org/protobuf v1.28.1 + github.com/xanzy/go-gitlab v0.86.0 + golang.org/x/net v0.8.0 + google.golang.org/grpc v1.55.0 + google.golang.org/protobuf v1.29.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.20.15 k8s.io/apimachinery v0.20.15