Skip to content

Commit 8e317df

Browse files
committed
Do NOT use SFTP_SUBSYS_DOMAIN for sftp subsys service as it doesn't exist.
Instead reuse SFTP_DOMAIN if set with automatic fall-back to IO_DOMAIN otherwise. Add a simple test case to verify sftp susbsys availability like the existing sftp test.
1 parent d446ad1 commit 8e317df

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

Dockerfile.centos7

+1-1
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ RUN python2 ./generateconfs.py --source=. \
11971197
#--trac_id_field=${TRAC_ID_FIELD} \
11981198
--openid_address=${OPENID_DOMAIN} \
11991199
--sftp_address=${SFTP_DOMAIN} \
1200-
--sftp_subsys_address=${SFTP_SUBSYS_DOMAIN} \
1200+
--sftp_subsys_address=${SFTP_DOMAIN} \
12011201
--ftps_address=${FTPS_DOMAIN} \
12021202
--davs_address=${WEBDAVS_DOMAIN} \
12031203
--public_http_port=${PUBLIC_HTTP_PORT} --public_https_port=${PUBLIC_HTTPS_PORT} \

Dockerfile.rocky8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ RUN ./generateconfs.py --source=. \
12141214
#--trac_id_field=${TRAC_ID_FIELD} \
12151215
--openid_address=${OPENID_DOMAIN} \
12161216
--sftp_address=${SFTP_DOMAIN} \
1217-
--sftp_subsys_address=${SFTP_SUBSYS_DOMAIN} \
1217+
--sftp_subsys_address=${SFTP_DOMAIN} \
12181218
--ftps_address=${FTPS_DOMAIN} \
12191219
--davs_address=${WEBDAVS_DOMAIN} \
12201220
--public_http_port=${PUBLIC_HTTP_PORT} --public_https_port=${PUBLIC_HTTPS_PORT} \

Dockerfile.rocky9

+1-1
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ RUN ./generateconfs.py --source=. \
10951095
#--trac_id_field=${TRAC_ID_FIELD} \
10961096
--openid_address=${OPENID_DOMAIN} \
10971097
--sftp_address=${SFTP_DOMAIN} \
1098-
--sftp_subsys_address=${SFTP_SUBSYS_DOMAIN} \
1098+
--sftp_subsys_address=${SFTP_DOMAIN} \
10991099
--ftps_address=${FTPS_DOMAIN} \
11001100
--davs_address=${WEBDAVS_DOMAIN} \
11011101
--public_http_port=${PUBLIC_HTTP_PORT} --public_https_port=${PUBLIC_HTTPS_PORT} \
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
source default
4+
5+
${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
6+
--connect-timeout 1 \
7+
--retry 1 \
8+
--user "${MIG_TEST_USER}:${MIG_TEST_USER_PASSWORD}" \
9+
sftp://${SFTP_DOMAIN}:${SFTP_SUBSYS_PORT}/welcome.txt \
10+
-k \
11+
-s \
12+
-v \
13+
-o /dev/null \
14+
> $(basename "$0").log \
15+
2>&1
16+
17+
[[ "$?" == 0 ]] && echo -e "${GREEN}passed${ENDCOLOR}" && exit 0
18+
echo -e "${RED}failed${ENDCOLOR}" && exit 1

0 commit comments

Comments
 (0)