Change test ftp service to sftp

eclipse-pass · Nov 6, 2023 · 7c1090f · 7c1090f
1 parent 50ecb03
commit 7c1090f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/.eclipse-pass.local_env b/.eclipse-pass.local_env
@@ -36,10 +36,10 @@ DSPACE_SERVER=dspace:8080
 [email protected]
 DSPACE_PASSWORD=admin
 
-PMC_FTP_HOST=pmc-ftp-server
-PMC_FTP_PORT=21
-PMC_FTP_USER=nihmsftpuser
-PMC_FTP_PASSWORD=nihmsftppass
+PMC_FTP_HOST=pmc-sftp-server
+PMC_FTP_PORT=22
+PMC_FTP_USER=pmcsftpuser
+PMC_FTP_PASSWORD=pmcsftppass
 
 ###################################################
 # Auth / Proxy config #############################

diff --git a/deposit/deposit-repositories.json b/deposit/deposit-repositories.json
@@ -70,15 +70,12 @@
     },
     "transport-config": {
       "protocol-binding": {
-        "protocol": "ftp",
+        "protocol": "sftp",
         "username": "${pmc.ftp.user}",
         "password": "${pmc.ftp.password}",
         "server-fqdn": "${pmc.ftp.host}",
         "server-port": "${pmc.ftp.port}",
-        "data-type": "binary",
-        "transfer-mode": "stream",
-        "use-pasv": true,
-        "default-directory": "/logs/upload/test/%s"
+        "default-directory": "/upload/%s"
       }
     }
   }

diff --git a/docker-compose-deposit.yml b/docker-compose-deposit.yml
@@ -30,19 +30,16 @@ services:
     volumes:
       - ./deposit/deposit-repositories.json:/deposit/deposit-repositories.json
 
-  pmc-ftp-server:
-    container_name: pmc-ftp-server
-    environment:
-      - FTP_USER=nihmsftpuser
-      - FTP_PASS=nihmsftppass
-    image: fauria/vsftpd
+  pmc-sftp-server:
+    container_name: pmc-sftp-server
+    image: atmoz/sftp
     ports:
-      - '20-21:20-21/tcp'
-      - '40000-40009:40000-40009/tcp'
+      - '2222:22/tcp'
     networks:
       - back
     volumes:
-      - ftpdata:/home/user
+      - sftpdata:/home/pmcsftpuser
+    command: pmcsftpuser:pmcsftppass:::upload
 
 volumes:
-  ftpdata:
+  sftpdata: