Unify the scripts for seafile and pro-seafile.

.gitignore

@@ -6,3 +6,5 @@
 
 bootstrap/*
 shared/*
+image/seafile/scripts
+image/pro-seafile/scripts

image/Makefile

@@ -23,23 +23,27 @@ base:
 	cd base && docker build -t $(base_image) .
 	docker-squash --tag $(base_image_squashed) $(base_image)
 	docker tag $(base_image_squashed) $(base_image)
+	docker rmi `docker images --filter "dangling=true" -q --no-trunc`
 
 server:
-	cd seafile && docker build -t $(server_image) .
+	cd seafile && cp -rf ../../scripts ./ && docker build -t $(server_image) .
 	docker-squash --tag $(server_image_squashed) $(server_image) --from-layer=$(base_image)
 	docker tag $(server_image_squashed) $(server_image)
 	docker tag $(server_image) $(latest_server_image)
+	docker rmi `docker images --filter "dangling=true" -q --no-trunc`
 
 pro-base:
 	cd pro_base && docker build -t $(pro_base_image) .
 	docker-squash --tag $(pro_base_image_squashed) $(pro_base_image)
 	docker tag $(pro_base_image_squashed) $(pro_base_image)
+	docker rmi `docker images --filter "dangling=true" -q --no-trunc`
 
 pro-server:
-	cd pro_seafile && docker build -t $(pro_server_image) .
+	cd pro_seafile && cp -rf ../../scripts ./ && docker build -t $(pro_server_image) .
 	docker-squash --tag $(pro_server_image_squashed) $(pro_server_image) --from-layer=$(pro_base_image)
 	docker tag $(pro_server_image_squashed) $(pro_server_image)
 	docker tag $(pro_server_image) $(latest_pro_server_image)
+	docker rmi `docker images --filter "dangling=true" -q --no-trunc`
 
 push-base:
 	docker push $(base_image)

image/pro_seafile/Dockerfile

@@ -10,7 +10,7 @@ RUN mkdir -p /opt/seafile/
 RUN curl -sSL -G -d "p=/seafile-pro-server_${SEAFILE_VERSION}_x86-64.tar.gz&dl=1" https://download.seafile.top/d/8c29766a64d24122936f/files/ \
     | tar xzf - -C /opt/seafile/
 
-ADD create_data_links.sh /etc/my_init.d/01_create_data_links.sh
+ADD scripts/create_data_links.sh /etc/my_init.d/01_create_data_links.sh
 
 COPY scripts /scripts
 COPY templates /templates

image/seafile/Dockerfile

@@ -3,13 +3,13 @@ WORKDIR /opt/seafile
 
 RUN mkdir -p /etc/my_init.d
 
-ENV SEAFILE_VERSION=6.2.5 SEAFILE_SERVER=seafile-pro-server
+ENV SEAFILE_VERSION=6.2.5 SEAFILE_SERVER=seafile-server
 
 RUN mkdir -p /opt/seafile/ && \
     curl -sSL -o - https://download.seadrive.org/seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz \
     | tar xzf - -C /opt/seafile/
 
-ADD create_data_links.sh /etc/my_init.d/01_create_data_links.sh
+ADD scripts/create_data_links.sh /etc/my_init.d/01_create_data_links.sh
 
 COPY scripts /scripts
 COPY templates /templates