Merge pull request #30 from dolevf/fix-ftp-startup

workaround start-stop-daemon in background mode issue
dolevf · Jul 3, 2024 · 8b3bb24 · 8b3bb24
2 parents 3e4360d + 3d411ea
commit 8b3bb24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Test Lab
         id: test
         run: | 
-          sudo make test
+          sleep 45 && sudo make test
         working-directory: ./lab
 
       - name: Slack Notification Success

diff --git a/lab/machines/p-ftp-01/Dockerfile b/lab/machines/p-ftp-01/Dockerfile
@@ -34,12 +34,11 @@ RUN git init var/www/html/backup/acme-impact-alliance  \
     && git add -A \
     && git commit -m 'commit code'
 
-
+RUN mkdir -p /var/run/vsftpd/empty
+
 # Entry
-ENTRYPOINT service vsftpd restart \
-    && \
-    service cron restart \
+ENTRYPOINT service cron restart \
     && \
     service apache2 restart \
     && \
-    tail -f /dev/null
+    vsftpd /etc/vsftpd.conf