Merge change from staging into master closing #4
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
### [1.2.1] - 2019/05/02
|
||||
- Fix #4:
|
||||
- Switch base image from Debian oldoldstable Jessie to Debian stable Buster to fix unmet dependencies of `seafile-cli` to `python-future` and `python-searpc`
|
||||
- Replace `;` with `&&` as commands separators in the Dockerfile's `RUN` to properly report failed commands at CI
|
||||
|
||||
## [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.
|
||||
|
||||
35
Dockerfile
35
Dockerfile
@@ -14,7 +14,7 @@
|
||||
# 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
|
||||
FROM debian:buster-slim
|
||||
|
||||
# Prevent the packages installation to halt.
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
@@ -28,30 +28,35 @@ 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 ;\
|
||||
RUN mkdir -p /etc/apt/sources.list.d/ && \
|
||||
apt-get update && \
|
||||
apt-get install -y gnupg && \
|
||||
echo "deb http://deb.seadrive.org buster main" \
|
||||
> /etc/apt/sources.list.d/seafile.list && \
|
||||
bash /import-seafile-apt-key.sh && \
|
||||
apt-get remove -y gnupg && \
|
||||
apt-get autoremove -y && \
|
||||
apt-get update && \
|
||||
apt-get install \
|
||||
-o Dpkg::Options::="--force-confold" \
|
||||
-y \
|
||||
seafile-cli \
|
||||
cron ;\
|
||||
apt-get clean ;\
|
||||
cron && \
|
||||
apt-get clean && \
|
||||
apt-get autoclean \
|
||||
-o APT::Clean-Installed=true ;\
|
||||
-o APT::Clean-Installed=true && \
|
||||
rm \
|
||||
-f \
|
||||
-rf \
|
||||
/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 ;\
|
||||
/var/lib/apt/lists/* \
|
||||
/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 ;\
|
||||
> /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.
|
||||
|
||||
10
README.md
10
README.md
@@ -1,4 +1,4 @@
|
||||
[](https://gitlab.com/flwgns-docker/seafile-client/commits/1.2.0)
|
||||
[](https://gitlab.com/flwgns-docker/seafile-client/commits/1.2.1)
|
||||
[](https://hub.docker.com/r/flowgunso/seafile-client)
|
||||
[](https://www.gnu.org/licenses/gpl-3.0)
|
||||
[](https://gitlab.com/flwgns-docker/seafile-client/)
|
||||
@@ -9,10 +9,10 @@ Weekly stable release are built every Monday at 6AM UTC+2.
|
||||
Permanent stable releases will not be built again.
|
||||
|
||||
## Weekly stable releases.
|
||||
[`1`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0),
|
||||
[`1.2`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0),
|
||||
[`1.2.0`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0),
|
||||
[`latest`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0)
|
||||
[`1`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.1),
|
||||
[`1.2`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.1),
|
||||
[`1.2.1`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.1),
|
||||
[`latest`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.1)
|
||||
|
||||
## Developmental releases.
|
||||
[`staging`](https://gitlab.com/flwgns-docker/seafile-client/tree/staging):
|
||||
|
||||
Reference in New Issue
Block a user