Merge change from staging into master closing #4

This commit is contained in:
flow.gunso
2019-12-30 00:07:33 +01:00
3 changed files with 30 additions and 20 deletions

View File

@@ -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 ## [1.2.0] - 2019/05/02
- Replace _supervisord_ with _cron_ for running the front job that keeps the container up. It uses less resources. - 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. - 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.

View File

@@ -14,7 +14,7 @@
# 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/>.
FROM debian:jessie-slim FROM debian:buster-slim
# Prevent the packages installation to halt. # Prevent the packages installation to halt.
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
@@ -28,30 +28,35 @@ COPY utils/build/import-seafile-apt-key.sh /
COPY assets/cron/docker-entrypoint.sh /entrypoint.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.
RUN mkdir -p /etc/apt/sources.list.d/ ;\ RUN mkdir -p /etc/apt/sources.list.d/ && \
echo "deb http://deb.seadrive.org jessie main" \ apt-get update && \
> /etc/apt/sources.list.d/seafile.list ;\ apt-get install -y gnupg && \
bash /import-seafile-apt-key.sh ;\ echo "deb http://deb.seadrive.org buster main" \
apt-get update ;\ > /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 \ apt-get install \
-o Dpkg::Options::="--force-confold" \ -o Dpkg::Options::="--force-confold" \
-y \ -y \
seafile-cli \ seafile-cli \
cron ;\ cron && \
apt-get clean ;\ apt-get clean && \
apt-get autoclean \ apt-get autoclean \
-o APT::Clean-Installed=true ;\ -o APT::Clean-Installed=true && \
rm \ rm \
-f \ -rf \
/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 ;\ /var/lib/apt/lists/* \
mkdir /volume/ ;\ /import-seafile-apt-key.sh && \
echo "seafuser" > /etc/cron.allow ;\ mkdir /volume/ && \
echo "seafuser" > /etc/cron.allow && \
echo "*/20 * * * * /bin/bash /home/seafuser/seafile-healthcheck.sh" \ echo "*/20 * * * * /bin/bash /home/seafuser/seafile-healthcheck.sh" \
> /var/spool/cron/crontabs/seafuser ;\ > /var/spool/cron/crontabs/seafuser && \
groupadd -g $GID -o $UNAME ;\ 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 required files for Seafile/SupervisorD. # Copy over the required files for Seafile/SupervisorD.

View File

@@ -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) [![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) [![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/) [![@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. Permanent stable releases will not be built again.
## Weekly stable releases. ## Weekly stable releases.
[`1`](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.0), [`1.2`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.1),
[`1.2.0`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.0), [`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.0) [`latest`](https://gitlab.com/flwgns-docker/seafile-client/tags/1.2.1)
## Developmental releases. ## Developmental releases.
[`staging`](https://gitlab.com/flwgns-docker/seafile-client/tree/staging): [`staging`](https://gitlab.com/flwgns-docker/seafile-client/tree/staging):