Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
Cloud
MAS
clonemap
Commits
416ea736
Commit
416ea736
authored
Jan 05, 2021
by
Stefan Dähling
Browse files
kubestub in container
parent
5c55954d
Pipeline
#385742
failed with stages
in 3 minutes and 58 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
416ea736
...
...
@@ -131,3 +131,13 @@ pnpdeploy:
-
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.git.rwth-aachen.de
-
docker tag plugnplay registry.git.rwth-aachen.de/acs/public/cloud/mas/clonemap/plugnplay
-
docker push registry.git.rwth-aachen.de/acs/public/cloud/mas/clonemap/plugnplay
frontenddeploy
:
stage
:
deploy
only
:
-
master
-
develop
script
:
-
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.git.rwth-aachen.de
-
docker tag frontend registry.git.rwth-aachen.de/acs/public/cloud/mas/clonemap/frontend
-
docker push registry.git.rwth-aachen.de/acs/public/cloud/mas/clonemap/frontend
build/docker/clonemap_local/Dockerfile
0 → 100644
View file @
416ea736
# Copyright 2020 Institute for Automation of Complex Power Systems,
# E.ON Energy Research Center, RWTH Aachen University
#
# This project is licensed under either of
# - Apache License, Version 2.0
# - MIT License
# at your option.
#
# Apache License, Version 2.0:
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# MIT License:
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
FROM
golang:1.13.8
AS
local_builder
WORKDIR
/clonemap
COPY
go.mod .
COPY
go.sum .
RUN
go mod download
COPY
cmd/kubestub cmd/kubestub
COPY
pkg/kubestub pkg/kubestub
COPY
pkg/schemas pkg/schemas
COPY
pkg/common pkg/common
ENV
PATH="/clonemap:${PATH}"
RUN
cd
cmd/kubestub
;
CGO_ENABLED
=
0
GOOS
=
linux go build
-ldflags
'-s'
-o
stub
;
cp
stub /clonemap/
FROM
docker:latest
WORKDIR
/root/
#RUN apk add --update netbase ca-certificates
COPY
--from=local_builder /clonemap/stub .
ENV
PATH="/root:${PATH}"
EXPOSE
8000
CMD
["./stub"]
docs/example.json
View file @
416ea736
{
"config"
:{
"name"
:
"test"
,
"agentsperagency"
:
1
,
"logging"
:
false
,
"mqtt"
:
false
,
"df"
:
false
,
"log"
:{
"msg"
:
true
,
"app"
:
true
,
"status"
:
true
,
"debug"
:
true
}},
"groups"
:[{
"config"
:{
"image"
:
"registry.git.rwth-aachen.de/acs/public/cloud/mas/clonemap/agency"
},
"agents"
:[{
"nodeid"
:
0
,
"name"
:
"AgentNoTask"
,
"type"
:
"NoTask"
,
"custom"
:
""
},{
"nodeid"
:
0
,
"name"
:
"AgentNoTask"
,
"type"
:
"NoTask"
,
"custom"
:
""
}]}],
"graph"
:{
"node"
:
null
,
"edge"
:
null
}}
\ No newline at end of file
{
"config"
:{
"name"
:
"test"
,
"agentsperagency"
:
1
,
"logging"
:
false
,
"mqtt"
:
true
,
"df"
:
false
,
"log"
:{
"msg"
:
true
,
"app"
:
true
,
"status"
:
true
,
"debug"
:
true
}},
"groups"
:[{
"config"
:{
"image"
:
"agentlibtest"
},
"agents"
:[{
"nodeid"
:
0
,
"name"
:
"AgentNoTask"
,
"type"
:
"NoTask"
,
"custom"
:
""
}]}],
"graph"
:{
"node"
:
null
,
"edge"
:
null
}}
\ No newline at end of file
pkg/kubestub/container.go
View file @
416ea736
...
...
@@ -50,15 +50,21 @@ import (
"fmt"
"os/exec"
"strconv"
"strings"
"time"
)
// createBridge creates a new docker bridge network for MAP parts to connect to
func
(
stub
*
LocalStub
)
createBridge
()
(
err
error
)
{
com
:=
"docker network create clonemap-net"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker network connect clonemap-net stub"
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
}
...
...
@@ -67,9 +73,16 @@ func (stub *LocalStub) createBridge() (err error) {
// deleteBridge deletes docker bridge network
func
(
stub
*
LocalStub
)
deleteBridge
()
(
err
error
)
{
com
:=
"docker network
rm
clonemap-net"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
com
:=
"docker network
disconnect
clonemap-net
stub
"
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker network rm clonemap-net"
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
}
...
...
@@ -81,7 +94,7 @@ func (stub *LocalStub) createFiware() (err error) {
com
:=
"docker run -d -p 27017:27017 --name=mongodb --hostname=mongodb --network=clonemap-net "
+
"-e ALLOW_EMPTY_PASSWORD=yes -e MONGODB_SYSTEM_LOG_VERBOSITY=3 -e MONGO_DATA_DIR=/data/db "
+
"-e MONGO_LOG_DIR=/dev/null mongo:4.2 --bind_ip_all --quiet"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -91,7 +104,7 @@ func (stub *LocalStub) createFiware() (err error) {
com
=
"docker run -d -p 1026:1026 --name=orion --hostname=orion --network=clonemap-net "
+
"fiware/orion-ld -dbhost mongodb -logForHumans"
// fmt.Println(com)
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -104,28 +117,28 @@ func (stub *LocalStub) createFiware() (err error) {
// deleteFiware stops amd removes orion and mongodb
func
(
stub
*
LocalStub
)
deleteFiware
()
(
err
error
)
{
com
:=
"docker stop orion"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm orion"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker stop mongodb"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm mongodb"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -135,48 +148,49 @@ func (stub *LocalStub) deleteFiware() (err error) {
// createAMS starts a new AMS docker image
func
(
stub
*
LocalStub
)
createAMS
()
(
err
error
)
{
com
:=
"ip route show | grep docker0 | awk '{print $9}'"
cmd
:=
exec
.
Command
(
"bash"
,
"-c"
,
com
)
// com := "ip route show | grep docker0 | awk '{print $9}'"
// cmd := exec.Command("sh", "-c", com)
// cmdOut, err := cmd.Output()
// if err != nil {
// err = errors.New(err.Error() + " " + strings.Trim(string(cmdOut), "\n"))
// } else {
// ip := strings.Trim(string(cmdOut), "\n")
com
:=
"docker run -d"
// com += " --add-host=parent-host:" + ip
com
+=
" -p 30009:9000"
com
+=
" --name=ams"
//.clonemap""
com
+=
" --hostname=ams"
com
+=
" --network=clonemap-net"
com
+=
" -e CLONEMAP_DEPLOYMENT_TYPE=
\"
local
\"
"
if
stub
.
fiware
{
com
+=
" -e CLONEMAP_STORAGE_TYPE=
\"
fiware
\"
"
}
else
{
com
+=
" -e CLONEMAP_STORAGE_TYPE=
\"
local
\"
"
}
com
+=
" -e CLONEMAP_SUFFIX=
\"
.clonemap
\"
"
com
+=
" -e CLONEMAP_LOG_LEVEL=
\"
error
\"
"
com
+=
" -e CLONEMAP_STUB_HOSTNAME=
\"
kubestub
\"
"
com
+=
" ams"
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
strings
.
Trim
(
string
(
cmdOut
),
"
\n
"
))
}
else
{
ip
:=
strings
.
Trim
(
string
(
cmdOut
),
"
\n
"
)
com
=
"docker run -d"
com
+=
" --add-host=parent-host:"
+
ip
com
+=
" -p 30009:9000"
com
+=
" --name=ams"
//.clonemap""
com
+=
" --hostname=ams"
com
+=
" --network=clonemap-net"
com
+=
" -e CLONEMAP_DEPLOYMENT_TYPE=
\"
local
\"
"
if
stub
.
fiware
{
com
+=
" -e CLONEMAP_STORAGE_TYPE=
\"
fiware
\"
"
}
else
{
com
+=
" -e CLONEMAP_STORAGE_TYPE=
\"
local
\"
"
}
com
+=
" -e CLONEMAP_SUFFIX=
\"
.clonemap
\"
"
com
+=
" -e CLONEMAP_LOG_LEVEL=
\"
error
\"
"
com
+=
" ams"
cmd
:=
exec
.
Command
(
"bash"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
}
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
}
// }
return
}
// deleteAMS stops amd removes AMS docker image
func
(
stub
*
LocalStub
)
deleteAMS
()
(
err
error
)
{
com
:=
"docker stop ams"
//.clonemap"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm ams"
//.clonemap"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -194,7 +208,7 @@ func (stub *LocalStub) createLogger() (err error) {
com
+=
" -e CLONEMAP_DEPLOYMENT_TYPE=
\"
local
\"
"
com
+=
" -e CLONEMAP_LOG_LEVEL=
\"
error
\"
"
com
+=
" logger"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -205,14 +219,14 @@ func (stub *LocalStub) createLogger() (err error) {
// deleteLogger stops amd removes Logger docker image
func
(
stub
*
LocalStub
)
deleteLogger
()
(
err
error
)
{
com
:=
"docker stop logger"
//.clonemap"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm logger"
//.clonemap"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -230,7 +244,7 @@ func (stub *LocalStub) createDF() (err error) {
com
+=
" -e CLONEMAP_DEPLOYMENT_TYPE=
\"
local
\"
"
com
+=
" -e CLONEMAP_LOG_LEVEL=
\"
error
\"
"
com
+=
" df"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -241,14 +255,14 @@ func (stub *LocalStub) createDF() (err error) {
// deleteDF stops amd removes DF docker image
func
(
stub
*
LocalStub
)
deleteDF
()
(
err
error
)
{
com
:=
"docker stop df"
//.clonemap"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm df"
//.clonemap"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -265,7 +279,7 @@ func (stub *LocalStub) createPnP() (err error) {
com
+=
" -e CLONEMAP_DEPLOYMENT_TYPE=
\"
local
\"
"
com
+=
" -e CLONEMAP_LOG_LEVEL=
\"
info
\"
"
com
+=
" plugnplay"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -276,14 +290,14 @@ func (stub *LocalStub) createPnP() (err error) {
// deletePnP stops amd removes PnP docker image
func
(
stub
*
LocalStub
)
deletePnP
()
(
err
error
)
{
com
:=
"docker stop pnp"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm pnp"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -301,7 +315,7 @@ func (stub *LocalStub) createFrontend() (err error) {
com
+=
" -e CLONEMAP_DEPLOYMENT_TYPE=
\"
local
\"
"
com
+=
" -e CLONEMAP_LOG_LEVEL=
\"
info
\"
"
com
+=
" frontend"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -312,14 +326,14 @@ func (stub *LocalStub) createFrontend() (err error) {
// deleteFrontend stops amd removes Frontend docker image
func
(
stub
*
LocalStub
)
deleteFrontend
()
(
err
error
)
{
com
:=
"docker stop fe"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm fe"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -336,7 +350,7 @@ func (stub *LocalStub) createMQTT() (err error) {
com
+=
" --network=clonemap-net"
com
+=
" -e CLONEMAP_DEPLOYMENT_TYPE=
\"
local
\"
"
com
+=
" eclipse-mosquitto"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -347,14 +361,14 @@ func (stub *LocalStub) createMQTT() (err error) {
// deleteMQTT stops amd removes MQTT Broker docker image
func
(
stub
*
LocalStub
)
deleteMQTT
()
(
err
error
)
{
com
:=
"docker stop mqtt"
//.clonemap"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
return
}
com
=
"docker rm mqtt"
//.clonemap"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -391,7 +405,7 @@ func (stub *LocalStub) createAgency(image string, masID int, imID int, agencyID
com
+=
" -e CLONEMAP_LOG_LEVEL=
\"
info
\"
"
com
+=
image
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -404,7 +418,7 @@ func (stub *LocalStub) deleteAgency(masID int, imID int, agencyID int) (err erro
com
:=
"docker stop "
com
+=
"mas-"
+
strconv
.
Itoa
(
masID
)
+
"-im-"
+
strconv
.
Itoa
(
imID
)
+
"-agency-"
+
strconv
.
Itoa
(
agencyID
)
+
".mas"
+
strconv
.
Itoa
(
masID
)
+
"agencies"
cmd
:=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
@@ -413,7 +427,7 @@ func (stub *LocalStub) deleteAgency(masID int, imID int, agencyID int) (err erro
com
=
"docker rm "
com
+=
"mas-"
+
strconv
.
Itoa
(
masID
)
+
"-im-"
+
strconv
.
Itoa
(
imID
)
+
"-agency-"
+
strconv
.
Itoa
(
agencyID
)
+
".mas"
+
strconv
.
Itoa
(
masID
)
+
"agencies"
cmd
=
exec
.
Command
(
"
ba
sh"
,
"-c"
,
com
)
cmd
=
exec
.
Command
(
"sh"
,
"-c"
,
com
)
cmdOut
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
err
=
errors
.
New
(
err
.
Error
()
+
" "
+
string
(
cmdOut
))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment