aboutsummaryrefslogtreecommitdiffstats
path: root/test/mocks
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-05-15 06:23:38 -0700
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-05-15 06:23:38 -0700
commit633caca8a409fb0685809082b7fc86d433d33f17 (patch)
treeefa6eb0454076be2d927af878f317b6c0ee731b7 /test/mocks
parentd203820b7e2174bd34fc66c22cd89213d2934aa9 (diff)
Fix ftp dir permission in sftp-server container
Container entrypoint descendant script in atmoz/sftp:alpine image is changing mount binded ftp dir owner to 'root' which makes removing it by 'clean' action not possible hence adding o+w permission for it. Change-Id: I0d9339db80c4cd8e31c4368ac63741c531a626fa Issue-ID: INT-1577 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'test/mocks')
-rw-r--r--test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml1
-rwxr-xr-xtest/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms.sh2
-rwxr-xr-xtest/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh5
3 files changed, 5 insertions, 3 deletions
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
index a13a76bd7..4e3c5a240 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
@@ -35,6 +35,7 @@ services:
- "${PORTSFTP}:22"
volumes:
- ./files/onap/:/home/onap/
+ - ./fix-sftp-perms.sh:/etc/sftp.d/fix-sftp-perms.sh
restart: on-failure
command: onap:pano:1001
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms.sh b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms.sh
new file mode 100755
index 000000000..b9f4dae85
--- /dev/null
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+chmod o+w /home/onap
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
index b1aa43749..1751d07c5 100755
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
@@ -94,9 +94,6 @@ function compose(){
cd config
envsubst < vsftpd_ssl-TEMPLATE.conf > vsftpd_ssl.conf
cd -
-
- set_vsftpd_file_owner
-
}
function build_image(){
@@ -109,6 +106,8 @@ function build_image(){
}
function set_vsftpd_file_owner() {
+ # This is to avoid "500 OOPS: cannot open config file"
+ # on vsftpd daemon start
sudo chown root ./config/vsftpd_ssl.conf
}