Merge branch 'staging'
This commit is contained in:
@@ -9,6 +9,13 @@ stages:
|
|||||||
before_script:
|
before_script:
|
||||||
- apk add bash
|
- apk add bash
|
||||||
|
|
||||||
|
cron_or_supervisord:
|
||||||
|
stage: build_publish
|
||||||
|
script:
|
||||||
|
- /bin/bash utils/publish/feature--cron-or-supervisord.sh
|
||||||
|
only:
|
||||||
|
- feature--cron-or-supervisord
|
||||||
|
|
||||||
staging:
|
staging:
|
||||||
stage: build_publish
|
stage: build_publish
|
||||||
script:
|
script:
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
## [1.2.0] - 2019/05/02
|
||||||
|
- Replace _supervisord_ with _cron_ for running the front job that keeps the container up. It uses less resources.
|
||||||
|
- Improve the __infinite-seaf-cli-start.sh__ into __seafile-healthcheck.sh__. The Seafile daemon will not be restarted if it's state are either _downloading_ or _committing_, which otherwise is problematic.
|
||||||
|
|
||||||
### [1.1.2] - 2019/04/18
|
### [1.1.2] - 2019/04/18
|
||||||
- Slim down the Docker image, from 102MB to 67MB, gaining 35MB, reducing size by 34%.
|
- Slim down the Docker image, from 102MB to 67MB, gaining 35MB, reducing size by 34%.
|
||||||
### [1.1.1] - 2019/04/18
|
### [1.1.1] - 2019/04/18
|
||||||
|
|||||||
39
Dockerfile
39
Dockerfile
@@ -18,19 +18,26 @@ FROM debian:jessie-slim
|
|||||||
|
|
||||||
# Prevent the packages installation to halt.
|
# Prevent the packages installation to halt.
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
# Create the seafile client user.
|
||||||
|
ENV UNAME=seafuser
|
||||||
|
ENV UID=1000
|
||||||
|
ENV GID=1000
|
||||||
|
|
||||||
# Copy over the seafile repository.
|
# Copy over the Docker related files.
|
||||||
COPY assets/seafile.list /etc/apt/sources.list.d/
|
COPY utils/build/import-seafile-apt-key.sh /
|
||||||
|
COPY assets/cron/docker-entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
# Safely import Seafile APT key, then install both seafile-cli and supervisord.
|
# Safely import Seafile APT key, then install both seafile-cli and supervisord.
|
||||||
COPY utils/build/import-seafile-apt-key.sh /
|
RUN mkdir -p /etc/apt/sources.list.d/ ;\
|
||||||
RUN /bin/bash /import-seafile-apt-key.sh ;\
|
echo "deb http://deb.seadrive.org jessie main" \
|
||||||
|
> /etc/apt/sources.list.d/seafile.list ;\
|
||||||
|
bash /import-seafile-apt-key.sh ;\
|
||||||
apt-get update ;\
|
apt-get update ;\
|
||||||
apt-get install \
|
apt-get install \
|
||||||
-o Dpkg::Options::="--force-confold" \
|
-o Dpkg::Options::="--force-confold" \
|
||||||
-y \
|
-y \
|
||||||
seafile-cli \
|
seafile-cli \
|
||||||
supervisor ;\
|
cron ;\
|
||||||
apt-get clean ;\
|
apt-get clean ;\
|
||||||
apt-get autoclean \
|
apt-get autoclean \
|
||||||
-o APT::Clean-Installed=true ;\
|
-o APT::Clean-Installed=true ;\
|
||||||
@@ -39,22 +46,16 @@ RUN /bin/bash /import-seafile-apt-key.sh ;\
|
|||||||
/var/log/fsck/*.log \
|
/var/log/fsck/*.log \
|
||||||
/var/log/apt/*.log \
|
/var/log/apt/*.log \
|
||||||
/var/cache/debconf/*.dat-old \
|
/var/cache/debconf/*.dat-old \
|
||||||
/import-seafile-apt-key.sh
|
/import-seafile-apt-key.sh ;\
|
||||||
|
mkdir /volume/ ;\
|
||||||
# Create the seafile client user.
|
echo "seafuser" > /etc/cron.allow ;\
|
||||||
ENV UNAME=seafuser
|
echo "*/20 * * * * /bin/bash /home/seafuser/seafile-healthcheck.sh" \
|
||||||
ENV UID=1000
|
> /var/spool/cron/crontabs/seafuser ;\
|
||||||
ENV GID=1000
|
groupadd -g $GID -o $UNAME ;\
|
||||||
RUN groupadd -g $GID -o $UNAME ;\
|
|
||||||
useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
|
useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
|
||||||
|
|
||||||
# Copy over the Docker entrypoint.
|
|
||||||
COPY assets/docker-entrypoint.sh /entrypoint.sh
|
|
||||||
|
|
||||||
# Copy over the required files for Seafile/SupervisorD.
|
# Copy over the required files for Seafile/SupervisorD.
|
||||||
COPY assets/supervisord.conf /home/seafuser/
|
COPY assets/cron/seafile-healthcheck.sh /home/seafuser/seafile-healthcheck.sh
|
||||||
COPY assets/infinite-seaf-cli-start.sh /home/seafuser/
|
COPY assets/cron/seafile-entrypoint.sh /home/seafuser/entrypoint.sh
|
||||||
COPY assets/seafile-entrypoint.sh /home/seafuser/entrypoint.sh
|
|
||||||
RUN mkdir /volume
|
|
||||||
|
|
||||||
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
||||||
|
|||||||
26
README.md
26
README.md
@@ -1,4 +1,4 @@
|
|||||||
[](https://gitlab.com/flwgns-docker/seafile-client/commits/1.1.2)
|
[](https://gitlab.com/flwgns-docker/seafile-client/commits/1.2.0)
|
||||||
[](https://hub.docker.com/r/flowgunso/seafile-client)
|
[](https://hub.docker.com/r/flowgunso/seafile-client)
|
||||||
[](https://www.gnu.org/licenses/gpl-3.0)
|
[](https://www.gnu.org/licenses/gpl-3.0)
|
||||||
[](https://gitlab.com/flwgns-docker/seafile-client/)
|
[](https://gitlab.com/flwgns-docker/seafile-client/)
|
||||||
@@ -8,32 +8,16 @@
|
|||||||
Weekly stable release are built every Monday at 6AM UTC+2.
|
Weekly stable release are built every Monday at 6AM UTC+2.
|
||||||
Permanent stable releases will not be built again.
|
Permanent stable releases will not be built again.
|
||||||
|
|
||||||
You can rely on the weekly stable releases. They are stable.
|
|
||||||
|
|
||||||
## Weekly stable releases.
|
## Weekly stable releases.
|
||||||
[`1`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.1.2),
|
[`1`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0),
|
||||||
[`1.1`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.1.2),
|
[`1.2`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0),
|
||||||
[`1.1.2`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.1.2),
|
[`1.2.0`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0),
|
||||||
[`latest`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.1.2)
|
[`latest`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0)
|
||||||
|
|
||||||
## Permanent stable releases.
|
|
||||||
[`1.1.1`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.1.1):
|
|
||||||
Release previous to the slim down. Image is larger than 100MB.
|
|
||||||
|
|
||||||
## Developmental releases.
|
## Developmental releases.
|
||||||
[`staging`](https://gitlab.com/flwgns-docker/seafile-client/tree/staging):
|
[`staging`](https://gitlab.com/flwgns-docker/seafile-client/tree/staging):
|
||||||
The purpose of this release is to test feature and make them available to anyone.
|
The purpose of this release is to test feature and make them available to anyone.
|
||||||
|
|
||||||
## Obsolete releases.
|
|
||||||
[`1.1.0`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.1.0)
|
|
||||||
see [issue #3](https://gitlab.com/flwgns-docker/seafile-client/issues/3).
|
|
||||||
|
|
||||||
[`1.0`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.0.6) and it's revision
|
|
||||||
[`1.0.6`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.0.6),
|
|
||||||
[`1.0.3`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.0.3),
|
|
||||||
[`1.0.2`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.0.2),
|
|
||||||
[`1.0.0`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.0.0) are now obsolete.
|
|
||||||
|
|
||||||
# Purpose
|
# Purpose
|
||||||
Docker Seafile Client allow you to sync a Seafile library within a container.
|
Docker Seafile Client allow you to sync a Seafile library within a container.
|
||||||
|
|
||||||
|
|||||||
56
assets/bash/Dockerfile
Normal file
56
assets/bash/Dockerfile
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
# 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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
FROM debian:jessie-slim
|
||||||
|
|
||||||
|
# Prevent the packages installation to halt.
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
# Specify the user running Seafile.
|
||||||
|
ENV UNAME=seafuser
|
||||||
|
ENV UID=1000
|
||||||
|
ENV GID=1000
|
||||||
|
|
||||||
|
# Copy over the Docker related files.
|
||||||
|
COPY utils/build/import-seafile-apt-key.sh /
|
||||||
|
COPY assets/bash/docker-entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
# Safely import Seafile APT key, then install both seafile-cli and supervisord.
|
||||||
|
RUN mkdir -p /etc/apt/sources.list.d/ ;\
|
||||||
|
echo "deb http://deb.seadrive.org jessie main" \
|
||||||
|
> /etc/apt/sources.list.d/seafile.list ;\
|
||||||
|
/bin/bash /import-seafile-apt-key.sh ;\
|
||||||
|
apt-get update ;\
|
||||||
|
apt-get install \
|
||||||
|
-o Dpkg::Options::="--force-confold" \
|
||||||
|
-y seafile-cli ;\
|
||||||
|
apt-get clean ;\
|
||||||
|
apt-get autoclean \
|
||||||
|
-o APT::Clean-Installed=true ;\
|
||||||
|
rm \
|
||||||
|
-f \
|
||||||
|
/var/log/fsck/*.log \
|
||||||
|
/var/log/apt/*.log \
|
||||||
|
/var/cache/debconf/*.dat-old \
|
||||||
|
/import-seafile-apt-key.sh ;\
|
||||||
|
mkdir /volume ;\
|
||||||
|
groupadd -g $GID -o $UNAME ;\
|
||||||
|
useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
|
||||||
|
|
||||||
|
# Copy over the required files for Seafile/SupervisorD.
|
||||||
|
COPY assets/bash/seafile-healthcheck.sh /home/seafuser/
|
||||||
|
COPY assets/bash/seafile-entrypoint.sh /home/seafuser/entrypoint.sh
|
||||||
|
|
||||||
|
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
||||||
54
assets/bash/docker-entrypoint.sh
Normal file
54
assets/bash/docker-entrypoint.sh
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
#!/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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Check mandatory Seafile configuration have been properly set.
|
||||||
|
if [ -z $SEAF_SERVER_URL ]; then echo "The \$SEAF_SERVER_URL was not defined. Stopping container..."; exit 1; fi
|
||||||
|
if [ -z $SEAF_USERNAME ]; then echo "The \$SEAF_USERNAME was not defined. Stopping container..."; exit 1; fi
|
||||||
|
if [ -z $SEAF_PASSWORD ]; then echo "The \$SEAF_PASSWORD was not defined. Stopping container..."; exit 1; fi
|
||||||
|
if [ -z $SEAF_LIBRARY_UUID ]; then echo "The \$SEAF_LIBRARY_UUID was not defined. Stopping container..."; exit 1; fi
|
||||||
|
|
||||||
|
# Update the user ID, if the $UID changed.
|
||||||
|
if [ "$UID" != "1000" ]; then
|
||||||
|
usermod -u $UID $UNAME
|
||||||
|
# What if the $UID already exists ?
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Change the group, if the $GID changed.
|
||||||
|
if [ "$GID" != "1000" ]; then
|
||||||
|
getent group | grep ":$GID:" >/dev/null
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
usermod -g $GID -G 1000 $UNAME
|
||||||
|
else
|
||||||
|
groupmod -g $GID $UNAME
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set the files ownership.
|
||||||
|
chown $UID.$GID -R /home/seafuser/seafile-healthcheck.sh
|
||||||
|
chown $UID.$GID -R /home/seafuser/entrypoint.sh
|
||||||
|
chown $UID.$GID -R /volume
|
||||||
|
|
||||||
|
# Run the Seafile client as the container user.
|
||||||
|
su - $UNAME << EO
|
||||||
|
export SEAF_SERVER_URL=$SEAF_SERVER_URL
|
||||||
|
export SEAF_USERNAME=$SEAF_USERNAME
|
||||||
|
export SEAF_PASSWORD=$SEAF_PASSWORD
|
||||||
|
export SEAF_LIBRARY_UUID=$SEAF_LIBRARY_UUID
|
||||||
|
export UNAME=$UNAME
|
||||||
|
/bin/bash /home/seafuser/entrypoint.sh
|
||||||
|
EO
|
||||||
38
assets/bash/seafile-entrypoint.sh
Normal file
38
assets/bash/seafile-entrypoint.sh
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#!/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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Define variable shortcuts for readability purposes.
|
||||||
|
seafile_ini=~/.ccnet/seafile.ini
|
||||||
|
seafile_sock=~/.seafile/seafile-data/seafile.sock
|
||||||
|
|
||||||
|
# Prepare the directories.
|
||||||
|
mkdir ~/.seafile
|
||||||
|
|
||||||
|
# Safely initialise the Seafile client.
|
||||||
|
/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
|
||||||
|
|
||||||
|
# Start the synchronisation.
|
||||||
|
/usr/bin/seaf-cli sync -u $SEAF_USERNAME -p $SEAF_PASSWORD -s $SEAF_SERVER_URL -l $SEAF_LIBRARY_UUID -d /volume
|
||||||
|
|
||||||
|
# Run the infinite Seafile restart.
|
||||||
|
source ~/seafile-healthcheck.sh
|
||||||
47
assets/bash/seafile-healthcheck.sh
Executable file
47
assets/bash/seafile-healthcheck.sh
Executable file
@@ -0,0 +1,47 @@
|
|||||||
|
#!/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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# `seaf-cli status` output csv-like information with tabulates as separators and columns named in comment lines.
|
||||||
|
# The Seafile client should not be restarted while some statuses are occuring, such as "downloading" or "committing".
|
||||||
|
#
|
||||||
|
# This script grabs the output while ignoring the comments to iterate over the informations set to their columns,
|
||||||
|
# then it compares the statuses, when not empty, to the ones that do not require a restart. Finally either restart or don't.
|
||||||
|
|
||||||
|
seaf=/usr/bin/seaf-cli
|
||||||
|
dont_restart_on=("downloading" "committing")
|
||||||
|
restart=true
|
||||||
|
|
||||||
|
sleep 10s
|
||||||
|
while true; do
|
||||||
|
while IFS=$'\t' read -r name status progress; do
|
||||||
|
if [ $status ]; then
|
||||||
|
for dont_restart_on_status in "${dont_restart_on[@]}"; do
|
||||||
|
if [ "$status" == "$dont_restart_on_status" ]; then
|
||||||
|
restart=false; break; break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
done < <($seaf status | grep -v "^#")
|
||||||
|
|
||||||
|
if $restart; then
|
||||||
|
$seaf stop
|
||||||
|
$seaf start
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
61
assets/cron/Dockerfile
Normal file
61
assets/cron/Dockerfile
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
# 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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
FROM debian:jessie-slim
|
||||||
|
|
||||||
|
# Prevent the packages installation to halt.
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
# Create the seafile client user.
|
||||||
|
ENV UNAME=seafuser
|
||||||
|
ENV UID=1000
|
||||||
|
ENV GID=1000
|
||||||
|
|
||||||
|
# Copy over the Docker related files.
|
||||||
|
COPY utils/build/import-seafile-apt-key.sh /
|
||||||
|
COPY assets/cron/docker-entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
# Safely import Seafile APT key, then install both seafile-cli and supervisord.
|
||||||
|
RUN mkdir -p /etc/apt/sources.list.d/ ;\
|
||||||
|
echo "deb http://deb.seadrive.org jessie main" \
|
||||||
|
> /etc/apt/sources.list.d/seafile.list ;\
|
||||||
|
bash /import-seafile-apt-key.sh ;\
|
||||||
|
apt-get update ;\
|
||||||
|
apt-get install \
|
||||||
|
-o Dpkg::Options::="--force-confold" \
|
||||||
|
-y \
|
||||||
|
seafile-cli \
|
||||||
|
cron ;\
|
||||||
|
apt-get clean ;\
|
||||||
|
apt-get autoclean \
|
||||||
|
-o APT::Clean-Installed=true ;\
|
||||||
|
rm \
|
||||||
|
-f \
|
||||||
|
/var/log/fsck/*.log \
|
||||||
|
/var/log/apt/*.log \
|
||||||
|
/var/cache/debconf/*.dat-old \
|
||||||
|
/import-seafile-apt-key.sh ;\
|
||||||
|
mkdir /volume/ ;\
|
||||||
|
echo "seafuser" > /etc/cron.allow ;\
|
||||||
|
echo "*/20 * * * * /bin/bash /home/seafuser/seafile-healthcheck.sh" \
|
||||||
|
> /var/spool/cron/crontabs/seafuser ;\
|
||||||
|
groupadd -g $GID -o $UNAME ;\
|
||||||
|
useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
|
||||||
|
|
||||||
|
# Copy over the required files for Seafile/SupervisorD.
|
||||||
|
COPY assets/cron/seafile-healthcheck.sh /home/seafuser/seafile-healthcheck.sh
|
||||||
|
COPY assets/cron/seafile-entrypoint.sh /home/seafuser/entrypoint.sh
|
||||||
|
|
||||||
|
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
||||||
56
assets/cron/docker-entrypoint.sh
Normal file
56
assets/cron/docker-entrypoint.sh
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
#!/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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Check mandatory Seafile configuration have been properly set.
|
||||||
|
if [ -z $SEAF_SERVER_URL ]; then echo "The \$SEAF_SERVER_URL was not defined. Stopping container..."; exit 1; fi
|
||||||
|
if [ -z $SEAF_USERNAME ]; then echo "The \$SEAF_USERNAME was not defined. Stopping container..."; exit 1; fi
|
||||||
|
if [ -z $SEAF_PASSWORD ]; then echo "The \$SEAF_PASSWORD was not defined. Stopping container..."; exit 1; fi
|
||||||
|
if [ -z $SEAF_LIBRARY_UUID ]; then echo "The \$SEAF_LIBRARY_UUID was not defined. Stopping container..."; exit 1; fi
|
||||||
|
|
||||||
|
# Update the user ID, if the $UID changed.
|
||||||
|
if [ "$UID" != "1000" ]; then
|
||||||
|
usermod -u $UID $UNAME
|
||||||
|
# What if the $UID already exists ?
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Change the group, if the $GID changed.
|
||||||
|
if [ "$GID" != "1000" ]; then
|
||||||
|
getent group | grep ":$GID:" >/dev/null
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
usermod -g $GID -G 1000 $UNAME
|
||||||
|
else
|
||||||
|
groupmod -g $GID $UNAME
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set the files ownership.
|
||||||
|
chown $UID.$GID /home/seafuser/seafile-healthcheck.sh
|
||||||
|
chown $UID.$GID /home/seafuser/entrypoint.sh
|
||||||
|
chown $UID.$GID -R /volume
|
||||||
|
|
||||||
|
# Run the Seafile client as the container user.
|
||||||
|
su - $UNAME << EO
|
||||||
|
export SEAF_SERVER_URL=$SEAF_SERVER_URL
|
||||||
|
export SEAF_USERNAME=$SEAF_USERNAME
|
||||||
|
export SEAF_PASSWORD=$SEAF_PASSWORD
|
||||||
|
export SEAF_LIBRARY_UUID=$SEAF_LIBRARY_UUID
|
||||||
|
export UNAME=$UNAME
|
||||||
|
/bin/bash /home/seafuser/entrypoint.sh
|
||||||
|
EO
|
||||||
|
|
||||||
|
cron -f
|
||||||
23
assets/infinite-seaf-cli-start.sh → assets/cron/seafile-entrypoint.sh
Executable file → Normal file
23
assets/infinite-seaf-cli-start.sh → assets/cron/seafile-entrypoint.sh
Executable file → Normal file
@@ -16,11 +16,20 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
set -x
|
# Define variable shortcuts for readability purposes.
|
||||||
|
seafile_ini=~/.ccnet/seafile.ini
|
||||||
|
seafile_sock=~/.seafile/seafile-data/seafile.sock
|
||||||
|
|
||||||
sleep 10
|
# Prepare the directories.
|
||||||
while true; do
|
mkdir ~/.seafile
|
||||||
/usr/bin/seaf-cli stop
|
|
||||||
/usr/bin/seaf-cli start
|
# Safely initialise the Seafile client.
|
||||||
sleep 1200
|
/usr/bin/seaf-cli init -d ~/.seafile
|
||||||
done
|
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
|
||||||
|
|
||||||
|
# Start the synchronisation.
|
||||||
|
/usr/bin/seaf-cli sync -u $SEAF_USERNAME -p $SEAF_PASSWORD -s $SEAF_SERVER_URL -l $SEAF_LIBRARY_UUID -d /volume
|
||||||
42
assets/cron/seafile-healthcheck.sh
Executable file
42
assets/cron/seafile-healthcheck.sh
Executable file
@@ -0,0 +1,42 @@
|
|||||||
|
#!/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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# `seaf-cli status` output csv-like information with tabulates as separators and columns named in comment lines.
|
||||||
|
# The Seafile client should not be restarted while some statuses are occuring, such as "downloading" or "committing".
|
||||||
|
#
|
||||||
|
# This script grabs the output while ignoring the comments to iterate over the informations set to their columns,
|
||||||
|
# then it compares the statuses, when not empty, to the ones that do not require a restart. Finally either restart or don't.
|
||||||
|
|
||||||
|
seaf=/usr/bin/seaf-cli
|
||||||
|
dont_restart_on=("downloading" "committing")
|
||||||
|
restart=true
|
||||||
|
|
||||||
|
while IFS=$'\t' read -r name status progress; do
|
||||||
|
if [ $status ]; then
|
||||||
|
for dont_restart_on_status in "${dont_restart_on[@]}"; do
|
||||||
|
if [ "$status" == "$dont_restart_on_status" ]; then
|
||||||
|
restart=false; break; break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
done < <($seaf status | grep -v "^#")
|
||||||
|
|
||||||
|
if $restart; then
|
||||||
|
$seaf stop
|
||||||
|
$seaf start
|
||||||
|
fi
|
||||||
58
assets/supervisord/Dockerfile
Normal file
58
assets/supervisord/Dockerfile
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
# 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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
FROM debian:jessie-slim
|
||||||
|
|
||||||
|
# Prevent the packages installation to halt.
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
# Specify the user running Seafile.
|
||||||
|
ENV UNAME=seafuser
|
||||||
|
ENV UID=1000
|
||||||
|
ENV GID=1000
|
||||||
|
|
||||||
|
# Copy over the Docker related files.
|
||||||
|
COPY utils/build/import-seafile-apt-key.sh /
|
||||||
|
COPY assets/supervisord/dockerentrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
# Safely import Seafile APT key, then install both seafile-cli and supervisord.
|
||||||
|
RUN mkdir -p /etc/apt/sources.list.d/ ;\
|
||||||
|
echo "deb http://deb.seadrive.org jessie main" \
|
||||||
|
> /etc/apt/sources.list.d/seafile.list ;\
|
||||||
|
/bin/bash /import-seafile-apt-key.sh ;\
|
||||||
|
apt-get update ;\
|
||||||
|
apt-get install \
|
||||||
|
-o Dpkg::Options::="--force-confold" \
|
||||||
|
-y \
|
||||||
|
seafile-cli \
|
||||||
|
supervisor ;\
|
||||||
|
apt-get clean ;\
|
||||||
|
apt-get autoclean \
|
||||||
|
-o APT::Clean-Installed=true ;\
|
||||||
|
rm \
|
||||||
|
-f \
|
||||||
|
/var/log/fsck/*.log \
|
||||||
|
/var/log/apt/*.log \
|
||||||
|
/var/cache/debconf/*.dat-old \
|
||||||
|
/import-seafile-apt-key.sh ;\
|
||||||
|
mkdir /volume ;\
|
||||||
|
groupadd -g $GID -o $UNAME ;\
|
||||||
|
useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
|
||||||
|
|
||||||
|
# Copy over the required files for Seafile/SupervisorD.
|
||||||
|
COPY assets/supervisord/supervisord.conf assets/supervisord/seafile-healthcheck.sh /home/seafuser/
|
||||||
|
COPY assets/supervisord/seafile-entrypoint.sh /home/seafuser/entrypoint.sh
|
||||||
|
|
||||||
|
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
||||||
@@ -40,7 +40,7 @@ fi
|
|||||||
|
|
||||||
# Set the files ownership.
|
# Set the files ownership.
|
||||||
chown $UID.$GID -R /home/seafuser/supervisord.conf
|
chown $UID.$GID -R /home/seafuser/supervisord.conf
|
||||||
chown $UID.$GID -R /home/seafuser/infinite-seaf-cli-start.sh
|
chown $UID.$GID -R /home/seafuser/seafile-healthcheck.sh
|
||||||
chown $UID.$GID -R /home/seafuser/entrypoint.sh
|
chown $UID.$GID -R /home/seafuser/entrypoint.sh
|
||||||
chown $UID.$GID -R /volume
|
chown $UID.$GID -R /volume
|
||||||
|
|
||||||
47
assets/supervisord/seafile-healthcheck.sh
Executable file
47
assets/supervisord/seafile-healthcheck.sh
Executable file
@@ -0,0 +1,47 @@
|
|||||||
|
#!/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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# `seaf-cli status` output csv-like information with tabulates as separators and columns named in comment lines.
|
||||||
|
# The Seafile client should not be restarted while some statuses are occuring, such as "downloading" or "committing".
|
||||||
|
#
|
||||||
|
# This script grabs the output while ignoring the comments to iterate over the informations set to their columns,
|
||||||
|
# then it compares the statuses, when not empty, to the ones that do not require a restart. Finally either restart or don't.
|
||||||
|
|
||||||
|
seaf=/usr/bin/seaf-cli
|
||||||
|
dont_restart_on=("downloading" "committing")
|
||||||
|
restart=true
|
||||||
|
|
||||||
|
sleep 10s
|
||||||
|
while true; do
|
||||||
|
while IFS=$'\t' read -r name status progress; do
|
||||||
|
if [ $status ]; then
|
||||||
|
for dont_restart_on_status in "${dont_restart_on[@]}"; do
|
||||||
|
if [ "$status" == "$dont_restart_on_status" ]; then
|
||||||
|
restart=false; break; break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
done < <($seaf status | grep -v "^#")
|
||||||
|
|
||||||
|
if $restart; then
|
||||||
|
$seaf stop
|
||||||
|
$seaf start
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
@@ -24,7 +24,7 @@ file=~/.seafile/seafile-data/seafile.sock
|
|||||||
|
|
||||||
# Manage the infinite `seaf-cli start`.
|
# Manage the infinite `seaf-cli start`.
|
||||||
[program:seaf-cli-start-loop]
|
[program:seaf-cli-start-loop]
|
||||||
command=/bin/bash /home/seafuser/infinite-seaf-cli-start.sh
|
command=/bin/bash /home/seafuser/seafile-healthcheck.sh
|
||||||
process_name=%(program_name)s
|
process_name=%(program_name)s
|
||||||
numprocs=1
|
numprocs=1
|
||||||
autostart=true
|
autostart=true
|
||||||
34
utils/publish/feature--cron-or-supervisord.sh
Executable file
34
utils/publish/feature--cron-or-supervisord.sh
Executable file
@@ -0,0 +1,34 @@
|
|||||||
|
#!/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 <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Restrict to pipeline triggered by pushes.
|
||||||
|
if [ $CI_PIPELINE_SOURCE != "push" ]; then
|
||||||
|
echo "This must be only ran from pushes."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Login with Docker Registry.
|
||||||
|
echo $CI_REGISTRY_BOT_PASSWORD | docker login -u $CI_REGISTRY_BOT_USERNAME docker.io --password-stdin
|
||||||
|
|
||||||
|
# Build and push as staging.
|
||||||
|
docker build -t index.docker.io/$CI_REGISTRY_IMAGE:staging-supervisord -f assets/supervisord/Dockerfile .
|
||||||
|
docker build -t index.docker.io/$CI_REGISTRY_IMAGE:staging-cron -f assets/cron/Dockerfile .
|
||||||
|
docker build -t index.docker.io/$CI_REGISTRY_IMAGE:staging-bash -f assets/bash/Dockerfile .
|
||||||
|
docker push index.docker.io/$CI_REGISTRY_IMAGE:staging-supervisord
|
||||||
|
docker push index.docker.io/$CI_REGISTRY_IMAGE:staging-cron
|
||||||
|
docker push index.docker.io/$CI_REGISTRY_IMAGE:staging-bash
|
||||||
Reference in New Issue
Block a user