Skip to content
Snippets Groups Projects
Commit 04f9e670 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Minor dependency upgrade and Docker image build improvements

parent a865d931
No related branches found
No related tags found
No related merge requests found
.idea/ .idea/
go.sum
pkg/cmd/server/server pkg/cmd/server/server
FROM golang:1.17.8-buster as builder FROM golang:1.19.0-buster as builder
WORKDIR / WORKDIR /
RUN apt-get update && apt-get install unzip 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 wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip
...@@ -8,8 +8,8 @@ COPY api/ api ...@@ -8,8 +8,8 @@ COPY api/ api
COPY pkg/ pkg COPY pkg/ pkg
COPY third_party/ third_party COPY third_party/ third_party
COPY go.mod/ . COPY go.mod/ .
COPY go.sum/ .
RUN go get google.golang.org/grpc
RUN go get github.com/johnaoss/htpasswd/apr1 RUN go get github.com/johnaoss/htpasswd/apr1
RUN go get github.com/xanzy/go-gitlab RUN go get github.com/xanzy/go-gitlab
RUN go get k8s.io/api/core/v1 RUN go get k8s.io/api/core/v1
...@@ -18,10 +18,13 @@ RUN go get k8s.io/apimachinery/pkg/types ...@@ -18,10 +18,13 @@ RUN go get k8s.io/apimachinery/pkg/types
RUN go get k8s.io/client-go/kubernetes RUN go get k8s.io/client-go/kubernetes
RUN go get k8s.io/client-go/rest RUN go get k8s.io/client-go/rest
RUN go get github.com/evanphx/json-patch RUN go get github.com/evanphx/json-patch
RUN go get google.golang.org/grpc
RUN go install google.golang.org/grpc
RUN go get github.com/golang/protobuf/protoc-gen-go RUN go get github.com/golang/protobuf/protoc-gen-go
RUN go install github.com/golang/protobuf/protoc-gen-go
RUN mkdir -p /build/pkg/api/v1 RUN mkdir -p /build/pkg/api/v1
RUN protoc --proto_path=/build/api/proto/v1 --proto_path=/build/third_party --go_out=plugins=grpc:/build/pkg/api/v1 config-service.proto RUN /bin/protoc --proto_path=/build/api/proto/v1 --proto_path=/build/third_party --go_out=plugins=grpc:/build/pkg/api/v1 config-service.proto
RUN CGO_ENABLED=0 GOOS=linux go test ./... RUN CGO_ENABLED=0 GOOS=linux go test ./...
WORKDIR /build/pkg/cmd/server WORKDIR /build/pkg/cmd/server
RUN CGO_ENABLED=0 GOOS=linux go build RUN CGO_ENABLED=0 GOOS=linux go build
......
#!/bin/bash #!/bin/bash
TAG=1.5.0 TAG=1.5.1
WHAT=janitor WHAT=janitor
sudo docker build --rm -t artifactory.software.geant.org/nmaas-docker-local/nmaas-$WHAT:$TAG . 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 sudo docker push artifactory.software.geant.org/nmaas-docker-local/nmaas-$WHAT:$TAG
go.sum 0 → 100644
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment