From fe9235d00cb471c3b1d0b2d8db35b4a37294ad22 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 18:50:29 +0100 Subject: [PATCH 01/30] Ignore developmental environment stuff --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..62c8935 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file From 9b2de96d427b1158e5b5773f3ce52e7a04bb6e6f Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 18:51:47 +0100 Subject: [PATCH 02/30] Commit existing code --- Dockerfile | 22 ++++++++++++++++++++++ LICENSE.txt | 21 +++++++++++++++++++++ assets/seafile.list | 1 + assets/supervisord.conf | 5 +++++ docker-compose.yml | 12 ++++++++++++ entrypoint.sh | 7 +++++++ 6 files changed, 68 insertions(+) create mode 100644 Dockerfile create mode 100644 LICENSE.txt create mode 100644 assets/seafile.list create mode 100644 assets/supervisord.conf create mode 100644 docker-compose.yml create mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..84ad4e1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM debian:jessie + +#ENV UID=1000 +#ENV GID=1000 +#RUN groupadd -g $GID -o seadrive +#RUN useradd -m -u $UID -g $GID -o -s /bin/bash seadrive + +ENV DEBIAN_FRONTEND noninteractive + +COPY assets/seafile.list /etc/apt/sources.list.d/ +COPY assets/supervisord.conf /etc/supervisor/ +COPY entrypoint.sh / + +RUN apt-key adv \ + --keyserver hkp://keyserver.ubuntu.com:80 \ + --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61 +RUN apt-get update ;\ + apt-get install -o Dpkg::Options::="--force-confold" -y seafile-cli supervisor + +RUN mkdir /seafile; mkdir /volume + +ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..61da8cd --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 flowgunso@gmail.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/assets/seafile.list b/assets/seafile.list new file mode 100644 index 0000000..11f6d09 --- /dev/null +++ b/assets/seafile.list @@ -0,0 +1 @@ +deb http://deb.seadrive.org jessie main \ No newline at end of file diff --git a/assets/supervisord.conf b/assets/supervisord.conf new file mode 100644 index 0000000..8a47225 --- /dev/null +++ b/assets/supervisord.conf @@ -0,0 +1,5 @@ +[supervisord] +nodaemon=true + +[unix_http_socket] +file=/seafile/seafile-data/seafile.sock \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e73d1ce --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: "3.4" + +services: + seafile-sync: + image: seafvol:latest + environment: + - SERVER= + - USERNAME= + - PASSWORD= + - LIBRARY_ID= +# - UID= +# - GID= \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..71c6386 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +/usr/bin/seaf-cli init -c /ccnet -d /seafile +/usr/bin/seaf-cli start -c /ccnet +/usr/bin/seaf-cli sync -c /ccnet -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume +sleep 10 +/usr/bin/supervisord \ No newline at end of file From 6eb631be4ce17316b69c22ab183c70fc626674a7 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 18:54:02 +0100 Subject: [PATCH 03/30] Add a GitLab CI configuration --- .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..596aa2c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +image: docker:latest + +services: +- docker:dind + +stages: +- build + +staging: + stage: build + before_script: + - echo $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin + script: + - docker build -t $CI_REGISTRY_IMAGE:staging . + - docker push $CI_REGISTRY_IMAGE:staging + only: + - staging + +production: + stage: build + before_script: + - echo $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin + script: + - docker build -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG . + - docker push $CI_REGISTRY_IMAGE:latest + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG + only: + - tags + except: + - branches \ No newline at end of file From 83d814fc7c130004b094c4ab2f565eff4b907edb Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:01:18 +0100 Subject: [PATCH 04/30] Move the supervisord.conf to the system root --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 84ad4e1..c4647a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ FROM debian:jessie ENV DEBIAN_FRONTEND noninteractive COPY assets/seafile.list /etc/apt/sources.list.d/ -COPY assets/supervisord.conf /etc/supervisor/ +COPY assets/supervisord.conf / COPY entrypoint.sh / RUN apt-key adv \ From e2ce24332912fd0fa4ba01f8ee91adab98c6a84f Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:02:20 +0100 Subject: [PATCH 05/30] Define and run the entrypoint as non-root --- Dockerfile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4647a3..a3b62b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,5 @@ FROM debian:jessie -#ENV UID=1000 -#ENV GID=1000 -#RUN groupadd -g $GID -o seadrive -#RUN useradd -m -u $UID -g $GID -o -s /bin/bash seadrive - ENV DEBIAN_FRONTEND noninteractive COPY assets/seafile.list /etc/apt/sources.list.d/ @@ -17,6 +12,17 @@ RUN apt-key adv \ RUN apt-get update ;\ apt-get install -o Dpkg::Options::="--force-confold" -y seafile-cli supervisor -RUN mkdir /seafile; mkdir /volume +RUN mkdir /.seafile; mkdir /volume; touch supervisord.log + +ARG UNAME=seafuser +ENV UID=1000 +ENV GID=1000 +RUN groupadd -g $GID -o $UNAME ;\ + useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME ;\ + chown $UID.$GID -R /.seafile ;\ + chown $UID.$GID -R /volume ;\ + chown $UID.$GID /supervisord.log ;\ + chown $UID.$GID /supervisord.conf +USER $UNAME ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file From 5ee51fcfbc6c9423860c38f0aedc63e0ed84aa35 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:03:15 +0100 Subject: [PATCH 06/30] Remove path to ccnet, run supervisord as non-root, sleep 5 after the seafile-daemon start to prevent issues --- entrypoint.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 71c6386..c92d74f 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,9 @@ #!/bin/bash -/usr/bin/seaf-cli init -c /ccnet -d /seafile -/usr/bin/seaf-cli start -c /ccnet -/usr/bin/seaf-cli sync -c /ccnet -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume -sleep 10 -/usr/bin/supervisord \ No newline at end of file +# There's 5 second timeout to make sure the seafile deamon is properly initialised. + +/usr/bin/seaf-cli init -d /.seafile +/usr/bin/seaf-cli start +sleep 5 +/usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume +/usr/bin/supervisord -u $UID -c /supervisord.conf \ No newline at end of file From 201c17a57dd6e0127a698a252d55a54ec3bb5689 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:03:28 +0100 Subject: [PATCH 07/30] Enable UID/GID! --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e73d1ce..e7aaffd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,5 +8,5 @@ services: - USERNAME= - PASSWORD= - LIBRARY_ID= -# - UID= -# - GID= \ No newline at end of file + - UID= + - GID= \ No newline at end of file From c3bf06460dc33e22bb966cfe02853e9036c116eb Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:31:19 +0100 Subject: [PATCH 08/30] Sleep a bit more --- entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index c92d74f..60b2624 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,7 +3,9 @@ # There's 5 second timeout to make sure the seafile deamon is properly initialised. /usr/bin/seaf-cli init -d /.seafile +sleep 5 /usr/bin/seaf-cli start sleep 5 /usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume +sleep 5 /usr/bin/supervisord -u $UID -c /supervisord.conf \ No newline at end of file From 14b819789d07f44ecd4e15b03e34623c206bd520 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:43:42 +0100 Subject: [PATCH 09/30] Pass UNAME as an environment variable --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3b62b0..2d592ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update ;\ RUN mkdir /.seafile; mkdir /volume; touch supervisord.log -ARG UNAME=seafuser +ENV UNAME=seafuser ENV UID=1000 ENV GID=1000 RUN groupadd -g $GID -o $UNAME ;\ From 5a703261619dee4feb6c2a025295a648fd980e22 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:44:20 +0100 Subject: [PATCH 10/30] Use $UNAME instead of $UID, try another way to make seafile syncing not fail --- entrypoint.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 60b2624..6a61620 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,11 +1,8 @@ #!/bin/bash -# There's 5 second timeout to make sure the seafile deamon is properly initialised. - /usr/bin/seaf-cli init -d /.seafile -sleep 5 +while [ ! -f ~/.ccnet/seafile.ini ]; do sleep 1; done /usr/bin/seaf-cli start -sleep 5 +while [ ! -f /.seafile/seafile-data/seafile.sock ]; do sleep 1; done /usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume -sleep 5 -/usr/bin/supervisord -u $UID -c /supervisord.conf \ No newline at end of file +/usr/bin/supervisord -u $UNAME -c /supervisord.conf \ No newline at end of file From f8d63f93008329cf1121bd58656bbb8ff56c3997 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Thu, 14 Mar 2019 23:54:56 +0100 Subject: [PATCH 11/30] Wait for a socket --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 6a61620..a91e517 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,6 +3,6 @@ /usr/bin/seaf-cli init -d /.seafile while [ ! -f ~/.ccnet/seafile.ini ]; do sleep 1; done /usr/bin/seaf-cli start -while [ ! -f /.seafile/seafile-data/seafile.sock ]; do sleep 1; done +while [ ! -S /.seafile/seafile-data/seafile.sock ]; do sleep 1; done /usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume /usr/bin/supervisord -u $UNAME -c /supervisord.conf \ No newline at end of file From 5802879c867595d97e6449e21ca0d3b1b97aa10c Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 00:16:15 +0100 Subject: [PATCH 12/30] Add an infinite loop that run seaf-cli start --- assets/seaf-cli-start.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 assets/seaf-cli-start.sh diff --git a/assets/seaf-cli-start.sh b/assets/seaf-cli-start.sh new file mode 100755 index 0000000..f8e3599 --- /dev/null +++ b/assets/seaf-cli-start.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +while true; do + /usr/bin/seaf-cli start + /bin/sleep 3600 +done \ No newline at end of file From 64bd2212cf926936ead6a49f9f5ecbbded9fd44f Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 00:16:35 +0100 Subject: [PATCH 13/30] Let Supervisord manage the seaf-cli start loop --- assets/supervisord.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/assets/supervisord.conf b/assets/supervisord.conf index 8a47225..8e8abd9 100644 --- a/assets/supervisord.conf +++ b/assets/supervisord.conf @@ -2,4 +2,10 @@ nodaemon=true [unix_http_socket] -file=/seafile/seafile-data/seafile.sock \ No newline at end of file +file=/seafile/seafile-data/seafile.sock + +[program:seaf-cli-start-loop] +command=/seaf-cli-start.sh +process_name=%(program_name)s +numprocs=1 +autostart=true \ No newline at end of file From dcee0370dc45365a2b6938931f7a20c69e3f6a17 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 00:17:00 +0100 Subject: [PATCH 14/30] Move Supervisord related files into it's own directory --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d592ad..aad63b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,12 @@ FROM debian:jessie ENV DEBIAN_FRONTEND noninteractive +RUN mkdir /.seafile ;\ + mkdir /.supervisord ;\ + mkdir /volume + COPY assets/seafile.list /etc/apt/sources.list.d/ -COPY assets/supervisord.conf / +COPY assets/supervisord.conf /.supervisord/ COPY entrypoint.sh / RUN apt-key adv \ @@ -12,17 +16,14 @@ RUN apt-key adv \ RUN apt-get update ;\ apt-get install -o Dpkg::Options::="--force-confold" -y seafile-cli supervisor -RUN mkdir /.seafile; mkdir /volume; touch supervisord.log - ENV UNAME=seafuser ENV UID=1000 ENV GID=1000 RUN groupadd -g $GID -o $UNAME ;\ useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME ;\ chown $UID.$GID -R /.seafile ;\ - chown $UID.$GID -R /volume ;\ - chown $UID.$GID /supervisord.log ;\ - chown $UID.$GID /supervisord.conf + chown $UID.$GID -R /.supervisord ;\ + chown $UID.$GID -R /volume USER $UNAME ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file From 89892bc5d69caf134cef03e70ecca1a6fa2e1c07 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 00:17:24 +0100 Subject: [PATCH 15/30] Run Supervisord into it's own directory --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index a91e517..0b35b23 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,4 +5,4 @@ while [ ! -f ~/.ccnet/seafile.ini ]; do sleep 1; done /usr/bin/seaf-cli start while [ ! -S /.seafile/seafile-data/seafile.sock ]; do sleep 1; done /usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume -/usr/bin/supervisord -u $UNAME -c /supervisord.conf \ No newline at end of file +/usr/bin/supervisord -u $UNAME -c /.supervisord/supervisord.conf -p /.supervisord/supervisord.pid \ No newline at end of file From 4c185d8c99c5d5749ee368082500a05f74eabc08 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 00:17:59 +0100 Subject: [PATCH 16/30] Add a initiative sleep, in case of whatever --- assets/seaf-cli-start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/seaf-cli-start.sh b/assets/seaf-cli-start.sh index f8e3599..89e5df0 100755 --- a/assets/seaf-cli-start.sh +++ b/assets/seaf-cli-start.sh @@ -1,5 +1,6 @@ #!/bin/bash +/bin/sleep 10 while true; do /usr/bin/seaf-cli start /bin/sleep 3600 From d39d1efa337e34e09dffd4c0392b151653faadc0 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 07:34:36 +0100 Subject: [PATCH 17/30] Prefix the seafile-cli start loop with bash --- assets/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/supervisord.conf b/assets/supervisord.conf index 8e8abd9..e5a30f0 100644 --- a/assets/supervisord.conf +++ b/assets/supervisord.conf @@ -5,7 +5,7 @@ nodaemon=true file=/seafile/seafile-data/seafile.sock [program:seaf-cli-start-loop] -command=/seaf-cli-start.sh +command=/bin/bash /seaf-cli-start.sh process_name=%(program_name)s numprocs=1 autostart=true \ No newline at end of file From 78acdc1ca2fde681ec61480ba9481c7c6e43e8d9 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 07:35:25 +0100 Subject: [PATCH 18/30] Fix the pid file option --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 0b35b23..bbbc16c 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,4 +5,4 @@ while [ ! -f ~/.ccnet/seafile.ini ]; do sleep 1; done /usr/bin/seaf-cli start while [ ! -S /.seafile/seafile-data/seafile.sock ]; do sleep 1; done /usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume -/usr/bin/supervisord -u $UNAME -c /.supervisord/supervisord.conf -p /.supervisord/supervisord.pid \ No newline at end of file +/usr/bin/supervisord -u $UNAME -c /.supervisord/supervisord.conf -j /.supervisord/supervisord.pid \ No newline at end of file From 3f667d7ed7684a5f04031561f85c3f6c38d49580 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 07:47:49 +0100 Subject: [PATCH 19/30] Use variable for readability, add the supervisord log --- entrypoint.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index bbbc16c..50d771a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,8 +1,14 @@ #!/bin/bash +seafile_ini=~/.ccnet/seafile.ini +seafile_sock=/.seafile/seafile-data/seafile.sock +supervisord_conf=/.supervisord/supervisord.conf +supervisord_pid=/.supervisord/supervisord.pid +supervisord_log=/.supervisord/supervisord.log + /usr/bin/seaf-cli init -d /.seafile -while [ ! -f ~/.ccnet/seafile.ini ]; do sleep 1; done +while [ ! -f $seafile_ini ]; do sleep 1; done /usr/bin/seaf-cli start -while [ ! -S /.seafile/seafile-data/seafile.sock ]; do sleep 1; done +while [ ! -S $seafile_sock ]; do sleep 1; done /usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume -/usr/bin/supervisord -u $UNAME -c /.supervisord/supervisord.conf -j /.supervisord/supervisord.pid \ No newline at end of file +/usr/bin/supervisord -u $UNAME -c $supervisord_log -j $supervisord_pid -l $supervisord_log \ No newline at end of file From fe5adb200301152702d83599a677f06e27d451af Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 07:56:35 +0100 Subject: [PATCH 20/30] Fix the supervisord configuration variable --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 50d771a..9cf7843 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,4 +11,4 @@ while [ ! -f $seafile_ini ]; do sleep 1; done /usr/bin/seaf-cli start while [ ! -S $seafile_sock ]; do sleep 1; done /usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume -/usr/bin/supervisord -u $UNAME -c $supervisord_log -j $supervisord_pid -l $supervisord_log \ No newline at end of file +/usr/bin/supervisord -u $UNAME -c $supervisord_conf -j $supervisord_pid -l $supervisord_log \ No newline at end of file From f619b5ac8fb3cb2505ab7dae00efe61c9437a7a7 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 08:16:15 +0100 Subject: [PATCH 21/30] Copy over the seafile-cli start script, set ownership to bash scripts --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aad63b1..0d85c68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ RUN mkdir /.seafile ;\ COPY assets/seafile.list /etc/apt/sources.list.d/ COPY assets/supervisord.conf /.supervisord/ +COPY assets/seaf-cli-start.sh / COPY entrypoint.sh / RUN apt-key adv \ @@ -23,7 +24,9 @@ RUN groupadd -g $GID -o $UNAME ;\ useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME ;\ chown $UID.$GID -R /.seafile ;\ chown $UID.$GID -R /.supervisord ;\ - chown $UID.$GID -R /volume + chown $UID.$GID -R /volume ;\ + chown $UID.$GID /entrypoint.sh ;\ + chown $UID.$GID /seaf-cli-start.sh USER $UNAME ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file From aad4c917d5419b0bf983d6e3069064960d264082 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 08:58:54 +0100 Subject: [PATCH 22/30] Document initial release v1.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..bd906d4 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +# [1.0] - 2019/03/15 +- Initial release \ No newline at end of file From 093bf25787bd7f168d558947a8198856987bd304 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 09:02:19 +0100 Subject: [PATCH 23/30] License to GPLv3 --- LICENSE.txt | 687 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 670 insertions(+), 17 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 61da8cd..648524f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,21 +1,674 @@ -MIT License + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -Copyright (c) 2019 flowgunso@gmail.com + Copyright (C) 2019 flow.gunso@gmail.com + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Preamble -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From b7ada6e875444a50e5bb31cf2f79a365d3a4f977 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 09:05:51 +0100 Subject: [PATCH 24/30] License the project files to GPLv3 --- Dockerfile | 16 ++++++++++++++++ assets/seaf-cli-start.sh | 16 ++++++++++++++++ assets/supervisord.conf | 16 ++++++++++++++++ entrypoint.sh | 16 ++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0d85c68..1eacb98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,19 @@ +# Docker Seafile client, help you mount a Seafile library as a volume. +# Copyright (C) 2019, flow.gunso@gmail.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + FROM debian:jessie ENV DEBIAN_FRONTEND noninteractive diff --git a/assets/seaf-cli-start.sh b/assets/seaf-cli-start.sh index 89e5df0..f6fa3f3 100755 --- a/assets/seaf-cli-start.sh +++ b/assets/seaf-cli-start.sh @@ -1,5 +1,21 @@ #!/bin/bash +# Docker Seafile client, help you mount a Seafile library as a volume. +# Copyright (C) 2019, flow.gunso@gmail.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + /bin/sleep 10 while true; do /usr/bin/seaf-cli start diff --git a/assets/supervisord.conf b/assets/supervisord.conf index e5a30f0..99505fc 100644 --- a/assets/supervisord.conf +++ b/assets/supervisord.conf @@ -1,3 +1,19 @@ +# Docker Seafile client, help you mount a Seafile library as a volume. +# Copyright (C) 2019, flow.gunso@gmail.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + [supervisord] nodaemon=true diff --git a/entrypoint.sh b/entrypoint.sh index 9cf7843..e26ab88 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,21 @@ #!/bin/bash +# Docker Seafile client, help you mount a Seafile library as a volume. +# Copyright (C) 2019, flow.gunso@gmail.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + seafile_ini=~/.ccnet/seafile.ini seafile_sock=/.seafile/seafile-data/seafile.sock supervisord_conf=/.supervisord/supervisord.conf From eac51aa8ed91c26fddd431658ba56b96972bfa87 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 10:08:24 +0100 Subject: [PATCH 25/30] Rename into infinite-seaf-cli-start.sh --- Dockerfile | 4 ++-- assets/{seaf-cli-start.sh => infinite-seaf-cli-start.sh} | 0 assets/supervisord.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename assets/{seaf-cli-start.sh => infinite-seaf-cli-start.sh} (100%) diff --git a/Dockerfile b/Dockerfile index 1eacb98..071df3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir /.seafile ;\ COPY assets/seafile.list /etc/apt/sources.list.d/ COPY assets/supervisord.conf /.supervisord/ -COPY assets/seaf-cli-start.sh / +COPY assets/infinite-seaf-cli-start.sh / COPY entrypoint.sh / RUN apt-key adv \ @@ -42,7 +42,7 @@ RUN groupadd -g $GID -o $UNAME ;\ chown $UID.$GID -R /.supervisord ;\ chown $UID.$GID -R /volume ;\ chown $UID.$GID /entrypoint.sh ;\ - chown $UID.$GID /seaf-cli-start.sh + chown $UID.$GID /infinite-seaf-cli-start.sh USER $UNAME ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/assets/seaf-cli-start.sh b/assets/infinite-seaf-cli-start.sh similarity index 100% rename from assets/seaf-cli-start.sh rename to assets/infinite-seaf-cli-start.sh diff --git a/assets/supervisord.conf b/assets/supervisord.conf index 99505fc..fb053cf 100644 --- a/assets/supervisord.conf +++ b/assets/supervisord.conf @@ -21,7 +21,7 @@ nodaemon=true file=/seafile/seafile-data/seafile.sock [program:seaf-cli-start-loop] -command=/bin/bash /seaf-cli-start.sh +command=/bin/bash /infinite-seaf-cli-start.sh process_name=%(program_name)s numprocs=1 autostart=true \ No newline at end of file From 4e65907b38fdcc9f585258577189b1fb860ac234 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 10:12:16 +0100 Subject: [PATCH 26/30] Improve overall documentation --- Dockerfile | 5 +++ README.md | 67 ++++++++++++++++++++++++++++++++++++++++- assets/supervisord.conf | 3 ++ docker-compose.yml | 17 +++++++---- entrypoint.sh | 6 +++- 5 files changed, 90 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 071df3d..dc7a99f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,23 +16,28 @@ FROM debian:jessie +# Prevent the packages installation to halt. ENV DEBIAN_FRONTEND noninteractive +# Prepare the directories. RUN mkdir /.seafile ;\ mkdir /.supervisord ;\ mkdir /volume +# Put the core functionalities into the image. COPY assets/seafile.list /etc/apt/sources.list.d/ COPY assets/supervisord.conf /.supervisord/ COPY assets/infinite-seaf-cli-start.sh / COPY entrypoint.sh / +# Install both seafile-cli and supervisord. RUN apt-key adv \ --keyserver hkp://keyserver.ubuntu.com:80 \ --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61 RUN apt-get update ;\ apt-get install -o Dpkg::Options::="--force-confold" -y seafile-cli supervisor +# Configure the user. ENV UNAME=seafuser ENV UID=1000 ENV GID=1000 diff --git a/README.md b/README.md index 28096ed..667e633 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,67 @@ -# Seafile Client +# Available tags. + +# Purpose +Docker Seafile Client allow you to sync a Seafile library within a container. Essentially, you have the ability to: +* **Share** data from a **Seafile library** as a volume to **other containers**. +## Seafile? +[Seafile is a cloud storage software](https://www.seafile.com/). + + +# Usage +The *Seafile* daemon is running from `/.seafile/` and `~/.ccnet`. +The library is synced at `/volume/`. + +The *Seafile* daemon is managed with *supervisord* since it can't run as a foreground process. +The *supervisord* is running from `/.supervisord/`, the `supervisord.conf`, `supervisord.log` and `supervisord.pid` can be found there. +*supervisord* also manage a shell script, `/seaf-cli-start.sh` which run `seaf-cli start` every hour: the synchronisation might not work properly if the previously is not run from times to times, for an unresolved reason. +## Examples +You would have to share the path `/volume/` to other containers, with the following approaches: +### Docker CLI +`docker run ` +### docker-compose +```yaml +version: "3.4" + +services: + seafile-sync: + image: registry.gitlab.com/flwgns-docker/docker-seafile-client:latest + volumes: + - your_shared_volume:/volume + environment: + - SEAF_SERVER_URL= # The URL to your Seafile server. + - SEAF_USERNAME= # Your Seafile username. + - SEAF_PASSWORD= # Your Seafile password + - SEAF_LIBRARY_UUID= # The Seafile library UUID you want to sync with. + - UID= # Default is 1000. + - GID= # Default is 1000. + +volumes: + your_shared_volume: +``` + + +# Environment variables +The following environment variable are available. + +## Seafile +This Docker **must be configured with the following**, **otherwise** it **will not run**: +## SEAF_SERVER_URL +The URL to your Seafile server. +## SEAF_USERNAME +Your Seafile account's username. +## SEAF_PASSWORD +Your Seafile account's password. +## SEAF_LIBRARY_UUID +The Seafile library UUID you want to use. + +## User permissions +This Docker is **not running as `root` but as `seafuser`**. You can override the user/group ID used with: +### UID +The user ID defaults to `1000`. You may want to override this variable to prevent permission issues. +### GID +The group ID defaults to `1000`. Similarly, you may want to override this variable to prevent permission issues. + +# Source code +This Docker image is licensed under GPLv3. +The source code is available in [gitlab.com/flwgns-docker/docker-seafile-client](https://gitlab.com/flwgns-docker/docker-seafile-client/). \ No newline at end of file diff --git a/assets/supervisord.conf b/assets/supervisord.conf index fb053cf..4b38bba 100644 --- a/assets/supervisord.conf +++ b/assets/supervisord.conf @@ -14,12 +14,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# Run in the foreground to keep the container running. [supervisord] nodaemon=true +# Manage the Seafile daemon. [unix_http_socket] file=/seafile/seafile-data/seafile.sock +# Manage the infinite `seaf-cli start`. [program:seaf-cli-start-loop] command=/bin/bash /infinite-seaf-cli-start.sh process_name=%(program_name)s diff --git a/docker-compose.yml b/docker-compose.yml index e7aaffd..46072ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,16 @@ version: "3.4" services: seafile-sync: - image: seafvol:latest + image: registry.gitlab.com/flwgns-docker/docker-seafile-client:latest + volumes: + your_shared_volume:/volume environment: - - SERVER= - - USERNAME= - - PASSWORD= - - LIBRARY_ID= + - SEAF_SERVER= + - SEAF_USERNAME= + - SEAF_PASSWORD= + - SEAF_LIBRARY_UUID= - UID= - - GID= \ No newline at end of file + - GID= + +volumes: + your_shared_volume: \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index e26ab88..9983944 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -22,9 +22,13 @@ supervisord_conf=/.supervisord/supervisord.conf supervisord_pid=/.supervisord/supervisord.pid supervisord_log=/.supervisord/supervisord.log +# Safely initialize Seafile. /usr/bin/seaf-cli init -d /.seafile while [ ! -f $seafile_ini ]; do sleep 1; done +# Safely start the Seafile daemon. /usr/bin/seaf-cli start while [ ! -S $seafile_sock ]; do sleep 1; done -/usr/bin/seaf-cli sync -u $USERNAME -p $PASSWORD -s $SERVER -l $LIBRARY_ID -d /volume +# Start the synchronisation. +/usr/bin/seaf-cli sync -u $SEAF_USERNAME -p $SEAF_PASSWORD -s $SEAF_SERVER_URL -l $SEAF_LIBRARY_UUID -d /volume +# Start the supervisord. /usr/bin/supervisord -u $UNAME -c $supervisord_conf -j $supervisord_pid -l $supervisord_log \ No newline at end of file From f6b83ae9bdf81b005ab74e01b224901f6dde757e Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 10:12:40 +0100 Subject: [PATCH 27/30] Check for mandatory environment variable at the entrypoint --- entrypoint.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index 9983944..3cec95b 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -16,6 +16,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# Check mandatory Seafile configuration have been properly set. +if [ -z $SEAF_SERVER_URL ]; then echo "The \$SEAF_SERVER_URL was not defined. Stopping container..."; echo 1; fi +if [ -z $SEAF_USERNAME ]; then echo "The \$SEAF_USERNAME was not defined. Stopping container..."; echo 1; fi +if [ -z $SEAF_PASSWORD ]; then echo "The \$SEAF_PASSWORD was not defined. Stopping container..."; echo 1; fi +if [ -z $SEAF_LIBRARY_UUID ]; then echo "The \$SEAF_LIBRARY_UUID was not defined. Stopping container..."; echo 1; fi + +# Define variable shortcuts for readability purposes. seafile_ini=~/.ccnet/seafile.ini seafile_sock=/.seafile/seafile-data/seafile.sock supervisord_conf=/.supervisord/supervisord.conf From ba6bac18e874c6f8ef7e21976590620a68dd0d09 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 10:59:42 +0100 Subject: [PATCH 28/30] Restrict production builds to standard tag/version number --- .gitlab-ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 596aa2c..4f656ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,19 @@ production: stage: build before_script: - echo $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin + - if ! [[ "$CI_COMMIT_TAG" =~ ^[0-9]+[.][0-9]+[.][0-9]+$ ]]; then echo "Version number must match major.minor.revision!"; exit 1; fi script: - - docker build -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG . + - MAJOR_NUMBER=$(echo "$CI_COMMIT_TAG" | awk -F \. {'print $1'}) + - MINOR_NUMBER=$(echo "$CI_COMMIT_TAG" | awk -F \. {'print $2'}) + - REVISION_NUMBER=$(echo "$CI_COMMIT_TAG" | awk -F \. {'print $3'}) + - MAJOR=$MAJOR_NUMBER + - MINOR=$MAJOR.$MINOR_NUMBER + - REVISION=$MINOR.$REVISION_NUMBER + - docker build -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$MAJOR -t $CI_REGISTRY_IMAGE:$MINOR -t $CI_REGISTRY_IMAGE:$REVISION . - docker push $CI_REGISTRY_IMAGE:latest - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG + - docker push $CI_REGISTRY_IMAGE:$MAJOR + - docker push $CI_REGISTRY_IMAGE:$MINOR + - docker push $CI_REGISTRY_IMAGE:$REVISION only: - tags except: From 582fea75533a17633dc28c147e761bd23a055ab4 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 10:59:55 +0100 Subject: [PATCH 29/30] Add available tags --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 667e633..8cb8ecb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # Available tags. +[`0`](https://gitlab.com/flwgns-docker/docker-seafile-client/tags/0.9.0), +[`0.9`](https://gitlab.com/flwgns-docker/docker-seafile-client/tags/0.9.0), +[`0.9.0`](https://gitlab.com/flwgns-docker/docker-seafile-client/tags/0.9.0), +[`latest`](https://gitlab.com/flwgns-docker/docker-seafile-client/tags/0.9.0) (see tag/release [0.9.0](https://gitlab.com/flwgns-docker/docker-seafile-client/tags/0.9.0)) + # Purpose Docker Seafile Client allow you to sync a Seafile library within a container. Essentially, you have the ability to: From 201565d1c117b92022907bb8adcb1630310a3ef8 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Fri, 15 Mar 2019 11:01:11 +0100 Subject: [PATCH 30/30] Document changes in v0.9.0! --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd906d4..3354c7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,2 @@ -# [1.0] - 2019/03/15 -- Initial release \ No newline at end of file +# [0.9.0] - 2019/03/15 +- Test release on GitLab, before Docker Hub