Commit aa52e1e8 authored by pfandzelter's avatar pfandzelter
Browse files

update containers

parent 2e28794d
Pipeline #152099 failed with stages
in 19 minutes and 17 seconds
# building the binary
FROM golang:1.16-alpine as golang
FROM golang:1.17-alpine as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# building the binary
FROM golang:1.16-alpine as golang
FROM golang:1.17-alpine as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# Base image: https://hub.docker.com/_/golang/
FROM golang:1.16
FROM golang:1.17
# Install golint
ENV GOPATH /go
......
......@@ -152,6 +152,10 @@ func main() {
s.Stop()
}()
log.Fatal().Err(s.Serve(lis)).Msg("Alexandra Server")
err = s.Serve(lis)
if err != nil {
log.Fatal().Msgf("Alexandra Server exited with error: %s", err.Error())
}
}
# This is a compy from the dockerfile that adds support for debugging. It is used in the 3NodeTest to debug nodeB
# building the binary
FROM golang:1.16-buster as golang
FROM golang:1.17-buster as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
module git.tu-berlin.de/mcc-fred/fred
go 1.16
go 1.17
require (
github.com/DistributedClocks/GoVector v0.0.0-20210402100930-db949c81a0af
......@@ -26,3 +26,98 @@ require (
google.golang.org/grpc v1.38.0
google.golang.org/protobuf v1.26.0
)
require (
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/DataDog/zstd v1.4.1 // indirect
github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect
github.com/Microsoft/hcsshim v0.8.16 // indirect
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.1.3 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.3.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.0.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.1.1 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.3.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.0.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.3.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.6.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect
github.com/containerd/containerd v1.5.0-beta.4 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.7+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/flatbuffers v1.12.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/moby/sys/mount v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.4.1 // indirect
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.0-rc93 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
go.etcd.io/etcd/client/v2 v2.305.0 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect
go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
go.opencensus.io v0.22.5 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
......@@ -299,6 +299,8 @@ func (m *Middleware) AddReplica(ctx context.Context, req *middleware.AddReplicaR
return nil, err
}
defer m.clientsMgr.updateKeygroupClients(req.Keygroup)
_, err = c.Client.AddReplica(ctx, &api.AddReplicaRequest{
Keygroup: req.Keygroup,
NodeId: req.NodeId,
......@@ -309,8 +311,6 @@ func (m *Middleware) AddReplica(ctx context.Context, req *middleware.AddReplicaR
return nil, err
}
m.clientsMgr.updateKeygroupClients(req.Keygroup)
return &middleware.Empty{}, err
}
......@@ -323,6 +323,8 @@ func (m *Middleware) RemoveReplica(ctx context.Context, req *middleware.RemoveRe
return nil, err
}
defer m.clientsMgr.updateKeygroupClients(req.Keygroup)
_, err = c.Client.RemoveReplica(ctx, &api.RemoveReplicaRequest{
Keygroup: req.Keygroup,
NodeId: req.NodeId,
......@@ -331,8 +333,6 @@ func (m *Middleware) RemoveReplica(ctx context.Context, req *middleware.RemoveRe
return nil, err
}
m.clientsMgr.updateKeygroupClients(req.Keygroup)
return &middleware.Empty{}, err
}
......
FROM golang:1.16-alpine
FROM golang:1.17-alpine
ENV PYTHONUNBUFFERED=1
RUN apk add --update --no-cache grpc make protoc python3
......
# Shamelessly stolen from the original dockerfile
# building the binary
FROM golang:1.16-alpine as golang
FROM golang:1.17-alpine as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# Shamelessly stolen from the original dockerfile
# building the binary
FROM golang:1.16-alpine as golang
FROM golang:1.17-alpine as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# Shamelessly stolen from the original dockerfile
# building the binary
FROM golang:1.16-alpine
FROM golang:1.17-alpine
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# Shamelessly stolen from the original dockerfile
# building the binary
FROM golang:1.16-alpine
FROM golang:1.17-alpine
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# building the binary
FROM golang:1.16-alpine as golang
FROM golang:1.17-alpine as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# building the binary
FROM golang:1.16-alpine as golang
FROM golang:1.17-alpine as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
# Shamelessly stolen from the original dockerfile
# building the binary
FROM golang:1.16-alpine as golang
FROM golang:1.17-alpine as golang
LABEL maintainer="tp@mcc.tu-berlin.de"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment