Merge branch 'static-dockerhub' of git.tt-rss.org:fox/ttrss-docker-compose into static-dockerhub

src/app/Dockerfile

@@ -5,7 +5,7 @@ RUN apk add --no-cache php7 php7-fpm \
 	php7-pdo php7-gd php7-pgsql php7-pdo_pgsql php7-mbstring \
 	php7-intl php7-xml php7-curl php7-session \
 	php7-dom php7-fileinfo php7-json \
-	php7-pcntl php7-posix \
+	php7-pcntl php7-posix php7-zip \
 	git postgresql-client sudo rsync
 
 ADD startup.sh /

src/app/build-prepare.sh

@@ -1,24 +1,10 @@
 #!/bin/sh
 
 DST_DIR=/src/tt-rss
-SRC_REPO=https://git.tt-rss.org/fox/tt-rss.git
 
-if [ ! -d $DST_DIR ]; then
-	mkdir -p $DST_DIR
-	git clone $SRC_REPO $DST_DIR
-else
-	cd $DST_DIR && \
-		git config core.filemode false && \
-		git pull origin master
-fi
+mkdir -p $DST_DIR
 
-if [ ! -d $DST_DIR/plugins.local/nginx_xaccel ]; then
-	git clone https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git $DST_DIR/plugins.local/nginx_xaccel
-else
-	cd $DST_DIR/plugins.local/nginx_xaccel && \
-		git config core.filemode false && \
-	  	git pull origin master
-fi
+git clone --branch master --depth 1 https://git.tt-rss.org/fox/tt-rss.git $DST_DIR
+git clone --branch master --depth 1 https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git $DST_DIR/plugins.local/nginx_xaccel
 
 mkdir -p /var/www
-

src/app/startup.sh

@@ -30,6 +30,7 @@ else
 		--exclude plugins.local \
 		--exclude templates.local \
 		--exclude themes.local \
+		--exclude config.php \
 		$SRC_DIR/ $DST_DIR/
 
 	rsync -aP --delete \