From 529a642c87b6699f66caead99623626c66963d3d Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 17 Mar 2016 17:20:49 +0100 Subject: [PATCH] updated dockerfile --- data/docker/devel/Dockerfile | 6 +++--- data/docker/devel/start.sh | 3 +-- sessionmanager/smg_it_test.go | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/data/docker/devel/Dockerfile b/data/docker/devel/Dockerfile index 915076ebb..47e251317 100644 --- a/data/docker/devel/Dockerfile +++ b/data/docker/devel/Dockerfile @@ -11,10 +11,10 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-key D76EDC7725E010CF && gpg - RUN echo 'deb http://files.freeswitch.org/repo/deb/debian/ jessie main' > /etc/apt/sources.list.d/freeswitch.list # add mongo repo keys -RUN apt-key adv --keyserver 'keyserver.ubuntu.com' --recv '7F0CEB10' +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 # add mongo repo -RUN echo 'deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.0 main' | tee '/etc/apt/sources.list.d/mongodb-org-3.0.list' +RUN echo 'deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.2 main' | tee '/etc/apt/sources.list.d/mongodb-org-3.2.list' # install dependencies RUN apt-get -y update && apt-get -y install git bzr mercurial redis-server mysql-server python-pycurl python-mysqldb postgresql postgresql-client sudo wget freeswitch-meta-vanilla vim zsh mongodb-org @@ -26,7 +26,7 @@ COPY mongod.conf /etc/mongod.conf RUN useradd -c CGRateS -d /var/run/cgrates -s /bin/false -r cgrates # install golang -RUN wget -qO- https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz | tar xzf - -C /root/ +RUN wget -qO- https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz | tar xzf - -C /root/ #install glide RUN GOROOT=/root/go GOPATH=/root/code /root/go/bin/go get github.com/Masterminds/glide diff --git a/data/docker/devel/start.sh b/data/docker/devel/start.sh index 75df8c736..fbacacd13 100755 --- a/data/docker/devel/start.sh +++ b/data/docker/devel/start.sh @@ -24,11 +24,10 @@ mongo --eval 'db.createUser({"user":"cgrates", "pwd":"CGRateS.org", "roles":[{ro #env vars export GOROOT=/root/go; export GOPATH=/root/code; export PATH=$GOROOT/bin:$GOPATH/bin:$PATH -export GO15VENDOREXPERIMENT=1 # build and install cgrates cd /root/cgr -#glide -y devel.yaml up +#glide -y devel.yaml install ./build.sh # create cgr-engine link diff --git a/sessionmanager/smg_it_test.go b/sessionmanager/smg_it_test.go index e508d1567..cd246596e 100644 --- a/sessionmanager/smg_it_test.go +++ b/sessionmanager/smg_it_test.go @@ -415,7 +415,7 @@ func TestSMGLastUsed(t *testing.T) { if err = smgRPC.Call("SMGenericV1.SessionEnd", smgEv, &rpl); err != nil || rpl != utils.OK { t.Error(err) } - eAcntVal = 7.09 + eAcntVal = 7.59 if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { t.Error(err) } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != eAcntVal {