Sfoglia il codice sorgente

feat: move data under /var/lib/sftpgo

Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
Mark Sagi-Kazar 4 anni fa
parent
commit
b4bd10521a
1 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4 4
      Dockerfile

+ 4 - 4
Dockerfile

@@ -31,12 +31,12 @@ SHELL ["/bin/bash", "-c"]
 # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-424546457
 # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-424546457
 RUN test ! -e /etc/nsswitch.conf && echo 'hosts: files dns' > /etc/nsswitch.conf
 RUN test ! -e /etc/nsswitch.conf && echo 'hosts: files dns' > /etc/nsswitch.conf
 
 
-RUN mkdir -p /data /etc/sftpgo /var/lib/sftpgo/backups /srv/sftpgo/web
+RUN mkdir -p /etc/sftpgo /var/lib/sftpgo/{backups,data} /srv/sftpgo/web
 
 
 RUN addgroup -g 1000 -S sftpgo
 RUN addgroup -g 1000 -S sftpgo
 RUN adduser -u 1000 -h /srv/sftpgo -s /sbin/nologin -G sftpgo -S -D -H sftpgo
 RUN adduser -u 1000 -h /srv/sftpgo -s /sbin/nologin -G sftpgo -S -D -H sftpgo
 
 
-VOLUME ["/data", "/var/lib/sftpgo"]
+VOLUME /var/lib/sftpgo
 
 
 # Override some configuration details
 # Override some configuration details
 ENV SFTPGO_CONFIG_DIR=/etc/sftpgo
 ENV SFTPGO_CONFIG_DIR=/etc/sftpgo
@@ -45,7 +45,7 @@ ENV SFTPGO_HTTPD__TEMPLATES_PATH=/srv/sftpgo/web/templates
 ENV SFTPGO_HTTPD__STATIC_FILES_PATH=/srv/sftpgo/web/static
 ENV SFTPGO_HTTPD__STATIC_FILES_PATH=/srv/sftpgo/web/static
 
 
 # Sane defaults, but users should still be able to override this from env vars
 # Sane defaults, but users should still be able to override this from env vars
-ENV SFTPGO_DATA_PROVIDER__USERS_BASE_DIR=/data
+ENV SFTPGO_DATA_PROVIDER__USERS_BASE_DIR=/var/lib/sftpgo/data
 ENV SFTPGO_HTTPD__BACKUPS_PATH=/var/lib/sftpgo/backups
 ENV SFTPGO_HTTPD__BACKUPS_PATH=/var/lib/sftpgo/backups
 
 
 COPY --from=builder /workspace/sftpgo.json /etc/sftpgo/sftpgo.json
 COPY --from=builder /workspace/sftpgo.json /etc/sftpgo/sftpgo.json
@@ -53,7 +53,7 @@ COPY --from=builder /workspace/templates /srv/sftpgo/web/templates
 COPY --from=builder /workspace/static /srv/sftpgo/web/static
 COPY --from=builder /workspace/static /srv/sftpgo/web/static
 COPY --from=builder /workspace/sftpgo /usr/local/bin/
 COPY --from=builder /workspace/sftpgo /usr/local/bin/
 
 
-RUN chown -R sftpgo:sftpgo /data /etc/sftpgo /var/lib/sftpgo /srv/sftpgo/web
+RUN chown -R sftpgo:sftpgo /etc/sftpgo /var/lib/sftpgo /srv/sftpgo/web
 
 
 USER sftpgo
 USER sftpgo