merge(): branch 'michael-k-patch-1' into master
This commit is contained in:
		| @@ -1,4 +1,4 @@ | ||||
| FROM alpine:3.7 | ||||
| FROM alpine:3.8 | ||||
|  | ||||
| LABEL description "Rainloop is a simple, modern & fast web-based client" \ | ||||
|       maintainer="Hardware <contact@meshup.net>" | ||||
| @@ -7,7 +7,7 @@ ARG GPG_FINGERPRINT="3B79 7ECE 694F 3B7B 70F3  11A4 ED7C 49D9 87DA 4591" | ||||
|  | ||||
| ENV UID=991 GID=991 UPLOAD_MAX_SIZE=25M LOG_TO_STDOUT=false MEMORY_LIMIT=128M | ||||
|  | ||||
| RUN echo "@community https://nl.alpinelinux.org/alpine/v3.7/community" >> /etc/apk/repositories \ | ||||
| RUN echo "@community https://nl.alpinelinux.org/alpine/v3.8/community" >> /etc/apk/repositories \ | ||||
|  && apk -U upgrade \ | ||||
|  && apk add -t build-dependencies \ | ||||
|     gnupg \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Hardware
					Hardware