diff options
| author |   Aaron Smith <aasmith@redhat.com> | 2018-11-09 13:10:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-09 13:10:45 +0000 |
| commit | fc9384689ff88b6e3014232a0ad4912c2041ae9c (patch) | |
| tree | 323348e8037ed48b219666b23a48e1b0e0d353ce | |
| parent | bca05b66373178fbc72dc9d4a6641e4b48256efb (diff) | |
| parent | 354e06c7edcb9434d55c06bfab4de157f0e2d012 (diff) | |
Merge "src, docker: Change pkg import path of DMA"
| -rw-r--r-- | docker/barometer-dma/Dockerfile | 10 | ||||
| -rw-r--r-- | src/dma/cmd/infofetch/daemon.go | 2 | ||||
| -rw-r--r-- | src/dma/cmd/threshold/transmit.go | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/docker/barometer-dma/Dockerfile b/docker/barometer-dma/Dockerfile index afe7c3f3..afd68c39 100644 --- a/docker/barometer-dma/Dockerfile +++ b/docker/barometer-dma/Dockerfile @@ -8,15 +8,13 @@ RUN yum update -y &&\ yum install -y golang # set environment variables -# need to change when we move to barometer ENV DOCKER y -ENV repos_dir /root/go/src/github.com/distributed-monitoring/agent +ENV repos_dir /root/go/src/github.com/opnfv -# copy repo code and -# COPY . ${repos_dir} +# get repo code and build WORKDIR ${repos_dir} -RUN git clone https://gerrit.opnfv.org/gerrit/barometer && \ - mv barometer/src/dma/* ./ +RUN git clone https://gerrit.opnfv.org/gerrit/barometer +WORKDIR ${repos_dir}/barometer/src/dma RUN go build ./cmd/server && \ go build ./cmd/threshold && \ go build ./cmd/infofetch diff --git a/src/dma/cmd/infofetch/daemon.go b/src/dma/cmd/infofetch/daemon.go index d4ff94f5..3bb51bc3 100644 --- a/src/dma/cmd/infofetch/daemon.go +++ b/src/dma/cmd/infofetch/daemon.go @@ -19,9 +19,9 @@ package main import ( "context" "github.com/BurntSushi/toml" - "github.com/distributed-monitoring/agent/pkg/common" "github.com/go-redis/redis" libvirt "github.com/libvirt/libvirt-go" + "github.com/opnfv/barometer/src/dma/pkg/common" "log" "sync" ) diff --git a/src/dma/cmd/threshold/transmit.go b/src/dma/cmd/threshold/transmit.go index 8cac2a88..8c60cc1a 100644 --- a/src/dma/cmd/threshold/transmit.go +++ b/src/dma/cmd/threshold/transmit.go @@ -19,8 +19,8 @@ package main import ( "bytes" "fmt" - "github.com/distributed-monitoring/agent/pkg/common" "github.com/go-redis/redis" + "github.com/opnfv/barometer/src/dma/pkg/common" "strconv" "strings" "time" |