From 755d019a65b3752f6371cfb79755c20088163e50 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Sun, 29 Dec 2019 23:47:06 +0100 Subject: [PATCH 1/3] Switch from colons to double ampersands to raise failures --- Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3272c7f..4be15b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,30 +28,30 @@ 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/ ;\ +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 ;\ + > /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 ;\ + cron && \ + apt-get clean && \ apt-get autoclean \ - -o APT::Clean-Installed=true ;\ + -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 ;\ + /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. From 8663b111123d801caf0f1e864273b9421aed0407 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Sun, 29 Dec 2019 23:49:43 +0100 Subject: [PATCH 2/3] Switch to Debian Buster, install/uninstall gpg to import repo keys, improve cleanup --- Dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4be15b4..ff1b902 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -FROM debian:jessie-slim +FROM debian:buster-slim # Prevent the packages installation to halt. ENV DEBIAN_FRONTEND noninteractive @@ -29,9 +29,13 @@ 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" \ + 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" \ @@ -42,10 +46,11 @@ RUN mkdir -p /etc/apt/sources.list.d/ && \ apt-get autoclean \ -o APT::Clean-Installed=true && \ rm \ - -f \ + -rf \ /var/log/fsck/*.log \ /var/log/apt/*.log \ /var/cache/debconf/*.dat-old \ + /var/lib/apt/lists/* \ /import-seafile-apt-key.sh && \ mkdir /volume/ && \ echo "seafuser" > /etc/cron.allow && \ From f53f798e8222ae67fd0f524150b7e4e64cf763e8 Mon Sep 17 00:00:00 2001 From: "flow.gunso" Date: Mon, 30 Dec 2019 00:00:50 +0100 Subject: [PATCH 3/3] Push version to 1.2.1 and log associated changes --- CHANGELOG.md | 5 +++++ README.md | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49efa52..6d4a41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/README.md b/README.md index 57e975d..936f259 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![1.2.0 build status](https://gitlab.com/flwgns-docker/seafile-client/badges/1.2.0/pipeline.svg)](https://gitlab.com/flwgns-docker/seafile-client/commits/1.2.0) +[![1.2.1 build status](https://gitlab.com/flwgns-docker/seafile-client/badges/1.2.1/pipeline.svg)](https://gitlab.com/flwgns-docker/seafile-client/commits/1.2.1) [![Docker pulls](https://img.shields.io/docker/pulls/flowgunso/seafile-client.svg)](https://hub.docker.com/r/flowgunso/seafile-client) [![Licensed under GPLv3](https://img.shields.io/badge/License-GPLv3-red.svg)](https://www.gnu.org/licenses/gpl-3.0) [![@gitlab.com/flwgns-docker/seafile-client](https://img.shields.io/badge/Source%20code-GitLab-red.svg)](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):