From 612c3d1d362f9163b204b7026c83fac207b89190 Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Wed, 5 May 2021 20:32:53 +0200 Subject: [PATCH 1/3] rainloop --- Makefile | 5 ++++- README.md | 1 + rainloop/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ rainloop/Makefile | 10 ++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 rainloop/Dockerfile create mode 100644 rainloop/Makefile diff --git a/Makefile b/Makefile index a7d47e4..c6ca325 100644 --- a/Makefile +++ b/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 +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 .PHONY: all $(images) all: $(images) @@ -64,3 +64,6 @@ xandikos: dendrite: $(BUILD) + +rainloop: + $(BUILD) diff --git a/README.md b/README.md index c206d6d..bd97644 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ useful. it and have it do useful things through docker in response to triggers * nfs-server * pleroma +* rainloop * sassc * syncthing * tasks: intended to run a cron daemon to run arbitrary periodic tasks. I mount diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile new file mode 100644 index 0000000..d09d8b9 --- /dev/null +++ b/rainloop/Dockerfile @@ -0,0 +1,35 @@ +FROM alpine:3.13 + +RUN apk add --no-cache \ + nginx \ + curl \ + php7-fpm \ + php7 \ + php7-curl \ + php7-iconv \ + php7-json \ + php7-dom && \ + mkdir -p /var/lib/www/rainloop && \ + cd /var/lib/www/rainloop && \ + curl -sL https://repository.rainloop.net/installer.php | php + +RUN addgroup \ + --gid 10001 \ + rainloop && \ + adduser \ + --uid 10000 \ + --home /var/lib/www/rainloop \ + --ingroup rainloop \ + --disabled-password \ + --shell /sbin/nologin \ + rainloop && \ + mkdir /run/nginx && \ + chown -R rainloop:rainloop \ + /var/lib/www/rainloop \ + /var/log/php7 \ + /var/lib/nginx \ + /var/log/nginx \ + /run/nginx + +USER rainloop +WORKDIR /var/lib/www/rainloop diff --git a/rainloop/Makefile b/rainloop/Makefile new file mode 100644 index 0000000..49c0359 --- /dev/null +++ b/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) . From dc494885851e87276691fb0d10f9998b035fdeac Mon Sep 17 00:00:00 2001 From: Linux User Date: Thu, 6 May 2021 12:05:36 +0200 Subject: [PATCH 2/3] fixed php access --- rainloop/Dockerfile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile index d09d8b9..989cbb4 100644 --- a/rainloop/Dockerfile +++ b/rainloop/Dockerfile @@ -8,28 +8,31 @@ RUN apk add --no-cache \ php7-curl \ php7-iconv \ php7-json \ + php7-openssl \ php7-dom && \ - mkdir -p /var/lib/www/rainloop && \ - cd /var/lib/www/rainloop && \ - curl -sL https://repository.rainloop.net/installer.php | php - -RUN addgroup \ + 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/lib/www/rainloop \ + --home /var/www/rainloop \ --ingroup rainloop \ --disabled-password \ --shell /sbin/nologin \ rainloop && \ - mkdir /run/nginx && \ + mkdir -p /run/nginx /var/run && \ + touch /var/run/nginx.pid && \ chown -R rainloop:rainloop \ - /var/lib/www/rainloop \ + /var/www/rainloop \ /var/log/php7 \ /var/lib/nginx \ /var/log/nginx \ - /run/nginx + /run/nginx \ + /var/run/nginx.pid USER rainloop -WORKDIR /var/lib/www/rainloop +WORKDIR /var/www/rainloop From 0a4ec8e3a157da04c143433733b25dfb216c6ee9 Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Tue, 11 May 2021 11:09:08 +0200 Subject: [PATCH 3/3] updated syncthing --- syncthing/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/syncthing/Dockerfile b/syncthing/Dockerfile index 105c54e..87f3add 100644 --- a/syncthing/Dockerfile +++ b/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 && \ - 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 +RUN mkdir -p /data && chown -R syncthing:syncthing /data -VOLUME /data /data/books /data/buku /var/lib/syncthing +VOLUME /data /var/lib/syncthing RUN cd /tmp && \ wget ${URI} && \