From eb65d9bfc11c348df9141030802e282c11c3a6a0 Mon Sep 17 00:00:00 2001 From: Shuai Lin Date: Thu, 12 Apr 2018 17:49:41 +0800 Subject: [PATCH] Update the base image --- image/Makefile | 2 +- image/base/Dockerfile | 6 +++--- image/seafile/Dockerfile | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/image/Makefile b/image/Makefile index 718af8e..b2fd866 100644 --- a/image/Makefile +++ b/image/Makefile @@ -14,7 +14,7 @@ base: cd base && docker build -t $(base_image) . squash-base: - docker-squash --tag $(base_image_squashed) $(base_image) --from-layer phusion/baseimage:0.9.19 + docker-squash --tag $(base_image_squashed) $(base_image) --from-layer phusion/baseimage:0.10.1 docker tag $(base_image_squashed) $(base_image) server: diff --git a/image/base/Dockerfile b/image/base/Dockerfile index bde688c..a6e5729 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -1,8 +1,8 @@ -# Lastet phusion baseimage as of 2016.11, based on ubuntu 16.04 +# Lastet phusion baseimage as of 20180412, based on ubuntu 16.04 # See https://hub.docker.com/r/phusion/baseimage/tags/ -FROM phusion/baseimage:0.9.19 +FROM phusion/baseimage:0.10.1 -ENV UPDATED_AT=20161124 \ +ENV UPDATED_AT=20180412 \ DEBIAN_FRONTEND=noninteractive CMD ["/sbin/my_init", "--", "bash", "-l"] diff --git a/image/seafile/Dockerfile b/image/seafile/Dockerfile index 2188de8..56c53ac 100644 --- a/image/seafile/Dockerfile +++ b/image/seafile/Dockerfile @@ -1,11 +1,6 @@ FROM seafileltd/base:16.04 WORKDIR /opt/seafile -# syslog-ng and syslog-forwarder would mess up the container stdout, not good -# when debugging/upgrading. -RUN sed -i -e 's|\(^exec syslog-ng.*$\)|\1 >>/var/log/syslog-ng.log 2>\&1|g' /etc/service/syslog-ng/run && \ - rm -rf /etc/service/syslog-forwarder - RUN mkdir -p /etc/my_init.d ENV SEAFILE_VERSION=6.2.5