Skip to content

Commit

Permalink
remove supervisor and adjacent sciripts
Browse files Browse the repository at this point in the history
Signed-off-by: Vladimir Lavor <[email protected]>
  • Loading branch information
VladoLavor committed May 10, 2019
1 parent e437a3a commit 62cc52d
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 241 deletions.
4 changes: 2 additions & 2 deletions cmd/vpp-agent-init/initializer/initializer.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import (
// paths
const (
// vpp default binary and config paths
defaultVppBinaryPath = "/opt/vpp-agent/dev/vpp/build-root/install-vpp-native/vpp/bin/vpp"
defaultVppBinaryPath = "/usr/bin/vpp"
defaultVppDebugBinaryPath = "/opt/vpp-agent/dev/vpp/build-root/install-vpp_debug-native/vpp/bin/vpp"
defaultVppStartupConfigPath = "/etc/vpp/vpp.conf"

// agent default binary and config paths
defaultAgentBinaryPath = "/go/bin/vpp-agent"
defaultAgentBinaryPath = "/bin/vpp-agent"
defaultAgentConfigDir = "/opt/vpp-agent/dev"
)

Expand Down
15 changes: 3 additions & 12 deletions docker/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN apt-get update \
autoconf automake build-essential ca-certificates curl gdb git \
graphviz inetutils-traceroute iproute2 ipsec-tools iputils-ping \
libapr1 libmbedcrypto1 libmbedtls10 libmbedx509-0 libtool \
make mc nano netcat python software-properties-common sudo supervisor \
make mc nano netcat python software-properties-common sudo \
telnet unzip wget python-cffi \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -100,14 +100,6 @@ COPY \
./

COPY docker/dev/vpp.conf /etc/vpp/vpp.conf
COPY docker/dev/supervisord.conf /etc/supervisord/supervisord.conf

# copy scripts
COPY \
docker/dev/exec_vpp.sh \
docker/dev/exec_agent.sh \
docker/dev/supervisord_kill.py \
/usr/bin/

ARG VERSION
ARG COMMIT
Expand All @@ -121,7 +113,6 @@ RUN cd $GOPATH/src/github.com/ligato/vpp-agent \

WORKDIR /

# run supervisor as the default executable
# run vpp-agent-init as the default executable
CMD rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api && \
exec vpp-agent-init
#exec /usr/bin/supervisord -c /etc/supervisord/supervisord.conf
exec vpp-agent-init -agent-bin="/go/bin/vpp-agent"
10 changes: 0 additions & 10 deletions docker/dev/exec_agent.sh

This file was deleted.

13 changes: 0 additions & 13 deletions docker/dev/exec_vpp.sh

This file was deleted.

26 changes: 0 additions & 26 deletions docker/dev/supervisord.conf

This file was deleted.

66 changes: 0 additions & 66 deletions docker/dev/supervisord_kill.py

This file was deleted.

13 changes: 3 additions & 10 deletions docker/prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ RUN apt-get update \
# other
ipsec-tools \
python \
supervisor \
netcat \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -42,6 +41,7 @@ COPY --from=base / /
COPY --from=devimg \
/go/bin/vpp-agent \
/go/bin/vpp-agent-ctl \
/go/bin/vpp-agent-init \
/bin/

# copy configs
Expand All @@ -52,16 +52,9 @@ COPY \
/opt/vpp-agent/dev/

COPY vpp.conf /etc/vpp/vpp.conf
COPY supervisord.conf /etc/supervisord/supervisord.conf

# copy scripts
COPY \
exec_agent.sh \
supervisord_kill.py \
/usr/bin/

WORKDIR /root/

# run supervisor as the default executable
# run vpp-agent-init as the default executable
CMD rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api && \
exec /usr/bin/supervisord -c /etc/supervisord/supervisord.conf
exec vpp-agent-init
10 changes: 0 additions & 10 deletions docker/prod/exec_agent.sh

This file was deleted.

26 changes: 0 additions & 26 deletions docker/prod/supervisord.conf

This file was deleted.

66 changes: 0 additions & 66 deletions docker/prod/supervisord_kill.py

This file was deleted.

0 comments on commit 62cc52d

Please sign in to comment.