Merge branch 'master' of ssh://192.168.1.191/dockerfiles

Makefile

@@ -1,4 +1,4 @@
-images=agate archivebox ansible backup buku ddclient git-daemon gitolite gitolite-pystagit rss-bridge pleroma sassc syncthing tasks tor transmission vdirsyncer xandikos nfs-server dendrite monero
+images=agate archivebox ansible backup buku ddclient git-daemon gitolite gitolite-pystagit rss-bridge pleroma sassc syncthing tasks tor transmission vdirsyncer xandikos nfs-server dendrite rainloop monero
 
 .PHONY: all $(images)
 all: $(images)
@@ -65,5 +65,8 @@ xandikos:
 dendrite:
 	$(BUILD)
 
+rainloop:
+	$(BUILD)
+
 monero:
 	$(BUILD)

README.md

@@ -31,6 +31,7 @@ useful.
 * monero
 * nfs-server
 * pleroma
+* rainloop
 * sassc
 * syncthing
 * tasks: intended to run a cron daemon to run arbitrary periodic tasks. I mount

rainloop/Dockerfile

@@ -0,0 +1,38 @@
+FROM alpine:3.13
+
+RUN apk add --no-cache \
+        nginx \
+        curl \
+        php7-fpm \
+        php7 \
+        php7-curl \
+        php7-iconv \
+        php7-json \
+	php7-openssl \
+        php7-dom && \
+    mkdir -p /var/www/rainloop && \
+    cd /var/www/rainloop && \
+    curl -sL https://repository.rainloop.net/installer.php | php && \
+    sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php7/php-fpm.d/www.conf && \
+    addgroup \
+        --gid 10001 \
+        rainloop && \
+    adduser \
+        --uid 10000 \
+        --home /var/www/rainloop \
+        --ingroup rainloop \
+        --disabled-password \
+        --shell /sbin/nologin \
+        rainloop && \
+    mkdir -p /run/nginx /var/run && \
+    touch /var/run/nginx.pid && \
+    chown -R rainloop:rainloop \
+        /var/www/rainloop \
+        /var/log/php7 \
+        /var/lib/nginx \
+        /var/log/nginx \
+        /run/nginx \
+	/var/run/nginx.pid
+
+USER rainloop
+WORKDIR /var/www/rainloop

rainloop/Makefile

@@ -0,0 +1,10 @@
+USERNAME = rilla
+IMG_NAME = rainloop
+
+.PHONY: build build-nc
+
+build: Dockerfile
+	docker build -t $(USERNAME)/$(IMG_NAME) .
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .

syncthing/Dockerfile

@@ -3,7 +3,7 @@
 FROM alpine:3.13
 
 ARG ARCH
-ENV VER v1.13.1
+ENV VER v1.16.1
 ENV REL syncthing-linux-${ARCH}-${VER}
 ENV URI https://github.com/syncthing/syncthing/releases/download/${VER}/${REL}.tar.gz
 
@@ -13,11 +13,9 @@ RUN adduser -u 1001 -h /var/lib/syncthing -D syncthing && \
     addgroup -S -g 1005 books && addgroup syncthing books && \
     addgroup -S -g 1006 buku  && addgroup syncthing buku
 
-RUN mkdir -p /data       && chown -R syncthing:syncthing /data && \
+RUN mkdir -p /data && chown -R syncthing:syncthing /data
-    mkdir -p /data/books && chown -R syncthing:books     /data/books && chmod '2775' /data/books && \
-    mkdir -p /data/buku  && chown -R syncthing:buku      /data/buku  && chmod '2775' /data/buku
 
-VOLUME /data /data/books /data/buku /var/lib/syncthing
+VOLUME /data /var/lib/syncthing
 
 RUN cd /tmp && \
     wget ${URI} && \