Skip to content

Commit

Permalink
fix docker image for client taking hostname
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzotomasini committed Jan 4, 2018
1 parent 0a4c088 commit 4c039d9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ vendor/
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

.idea

# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
Expand Down Expand Up @@ -75,3 +77,5 @@ fabric.properties
/badger/
/badger/**
/main/badger/


5 changes: 1 addition & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
name = "github.com/dgraph-io/badger"
version = "0.8.0"

[[constraint]]
name = "github.com/docker/go-connections"
version = "0.3.0"
[[constraint]]
name = "github.com/openbaton/go-openbaton"
version = "master"
version = "*"
3 changes: 2 additions & 1 deletion dockerfiles/iperf/client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ EXPOSE 5001

RUN apk update && apk add iperf
ENV SERVER_MGMT ''
ENV SERVER_HOSTNAME ''
ENV TIME '150'
#CMD iperf -c $SERVER_MGMT -t 150
ENTRYPOINT echo "Connecting to iperfserver for $TIME sec" && iperf -c iperfserver -t $TIME
ENTRYPOINT echo "Connecting to: $SERVER_HOSTNAME for $TIME sec" && iperf -c $SERVER_HOSTNAME -t $TIME
3 changes: 1 addition & 2 deletions handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func (h *HandlerVnfmImpl) dockerStartContainer(cfg VnfrConfig, vdu *catalogue.Vi
portBindings := make(nat.PortMap)

expPorts := make(nat.PortSet)
var pubAllPort bool = false
var pubAllPort = false
for _, v := range cfg.PubPort {
pubAllPort = true
port, err := nat.NewPort("tcp", v)
Expand All @@ -268,7 +268,6 @@ func (h *HandlerVnfmImpl) dockerStartContainer(cfg VnfrConfig, vdu *catalogue.Vi
}
envList := GetEnv(h.Logger, cfg)

//h.Logger.Noticef("%s: EnvVar: %v", cfg.Name, envList)
h.Logger.Noticef("%s: Image: %v", cfg.Name, cfg.ImageName)

config := &container.Config{
Expand Down

0 comments on commit 4c039d9

Please sign in to comment.