diff options
| author |   Yulong Pei <yulong.pei@intel.com> | 2022-10-26 09:14:42 +0000 |
|---|---|---|
| committer |   Fan Zhang <royzhang1980@hotmail.com> | 2022-11-01 20:20:50 +0000 |
| commit | de0c1af4478d64af92c5d1ac749fa67cc19ec0dd (patch) | |
| tree | 85e18484ab21a53a1dc82eb08382eac49fdc1ecb /extras | |
| parent | 768f284351fc680d90d8e4f41be14579e110c588 (diff) | |
vpp-swan: remove step to copy vpp_sswan source for docker image
Since vpp_sswan plugin already merged in /vpp/extras/strongswan,
no need to provide additional vpp_sswan source files for docker image.
Type: fix
Signed-off-by: Yulong Pei <yulong.pei@intel.com>
Change-Id: I35bad22b1046e0dddbcf39e1af38d589d1438239
Signed-off-by: Yulong Pei <yulong.pei@intel.com>
Diffstat (limited to 'extras')
6 files changed, 4 insertions, 6 deletions
diff --git a/extras/strongswan/vpp_sswan/docker/Dockerfile b/extras/strongswan/vpp_sswan/docker/Dockerfile index a0307083baf..616b72d3555 100644 --- a/extras/strongswan/vpp_sswan/docker/Dockerfile +++ b/extras/strongswan/vpp_sswan/docker/Dockerfile @@ -23,6 +23,5 @@ RUN chmod +x /root/init_docker1.sh RUN chmod +x /root/init_docker2.sh RUN chmod +x /root/init.sh RUN chmod +x /root/run_vpp.sh -COPY / /root/vpp_sswan RUN ./init.sh diff --git a/extras/strongswan/vpp_sswan/docker/configs/startup.conf b/extras/strongswan/vpp_sswan/docker/configs/startup.conf index 5cdd389e6f1..5c1952e1002 100644 --- a/extras/strongswan/vpp_sswan/docker/configs/startup.conf +++ b/extras/strongswan/vpp_sswan/docker/configs/startup.conf @@ -2,7 +2,7 @@ unix { nodaemon full-coredump cli-listen /run/vpp/cli.sock - exec /root/vpp_sswan/docker/configs/vpp.conf + exec /root/vpp/extras/strongswan/vpp_sswan/docker/configs/vpp.conf } api-trace { diff --git a/extras/strongswan/vpp_sswan/docker/scripts/init.sh b/extras/strongswan/vpp_sswan/docker/scripts/init.sh index 80901c97d87..97a087b1a2f 100644 --- a/extras/strongswan/vpp_sswan/docker/scripts/init.sh +++ b/extras/strongswan/vpp_sswan/docker/scripts/init.sh @@ -4,6 +4,5 @@ echo "Initialization Image" git clone https://github.com/FDio/vpp.git ./vpp -cp -R vpp_sswan vpp/extras/strongswan/ cd vpp yes | make install-dep diff --git a/extras/strongswan/vpp_sswan/docker/scripts/init_docker1.sh b/extras/strongswan/vpp_sswan/docker/scripts/init_docker1.sh index 9be77867683..51e7b3d7851 100644 --- a/extras/strongswan/vpp_sswan/docker/scripts/init_docker1.sh +++ b/extras/strongswan/vpp_sswan/docker/scripts/init_docker1.sh @@ -21,4 +21,4 @@ sudo systemctl restart strongswan.service echo "### Loaded plugin in strogswan" sudo swanctl --stats -sudo cp /root/vpp_sswan/docker/configs/swanctl_docker1.conf /etc/swanctl/conf.d/swanctl.conf +sudo cp /root/vpp/extras/strongswan/vpp_sswan/docker/configs/swanctl_docker1.conf /etc/swanctl/conf.d/swanctl.conf diff --git a/extras/strongswan/vpp_sswan/docker/scripts/init_docker2.sh b/extras/strongswan/vpp_sswan/docker/scripts/init_docker2.sh index 2e38fbabca2..237a341a1f8 100644 --- a/extras/strongswan/vpp_sswan/docker/scripts/init_docker2.sh +++ b/extras/strongswan/vpp_sswan/docker/scripts/init_docker2.sh @@ -14,7 +14,7 @@ cd /root/strongswan-${VERSION_SSWAN} make -j$(nproc) sudo make install -sudo cp /root/vpp_sswan/docker/configs/swanctl_docker2.conf /etc/swanctl/conf.d/swanctl.conf +sudo cp /root/vpp/extras/strongswan/vpp_sswan/docker/configs/swanctl_docker2.conf /etc/swanctl/conf.d/swanctl.conf sudo systemctl daemon-reload sudo systemctl restart strongswan.service diff --git a/extras/strongswan/vpp_sswan/docker/scripts/run_vpp.sh b/extras/strongswan/vpp_sswan/docker/scripts/run_vpp.sh index 0497d8aec38..e21d92503eb 100644 --- a/extras/strongswan/vpp_sswan/docker/scripts/run_vpp.sh +++ b/extras/strongswan/vpp_sswan/docker/scripts/run_vpp.sh @@ -1,7 +1,7 @@ #!/bin/bash cd /root/vpp/ -make run-release STARTUP_CONF=/root/vpp_sswan/docker/configs/startup.conf & +make run-release STARTUP_CONF=/root/vpp/extras/strongswan/vpp_sswan/docker/configs/startup.conf & sleep 5 |