Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
Bump alpine to 3.14 See merge request pleroma/pleroma!3569
This commit is contained in:
		
						commit
						b686d68cdb
					
				
					 1 changed files with 2 additions and 3 deletions
				
			
		|  | @ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make cmake file-dev &&\ | ||||||
| 	mkdir release &&\ | 	mkdir release &&\ | ||||||
| 	mix release --path release | 	mix release --path release | ||||||
| 
 | 
 | ||||||
| FROM alpine:3.11 | FROM alpine:3.14 | ||||||
| 
 | 
 | ||||||
| ARG BUILD_DATE | ARG BUILD_DATE | ||||||
| ARG VCS_REF | ARG VCS_REF | ||||||
|  | @ -31,8 +31,7 @@ LABEL maintainer="ops@pleroma.social" \ | ||||||
| ARG HOME=/opt/pleroma | ARG HOME=/opt/pleroma | ||||||
| ARG DATA=/var/lib/pleroma | ARG DATA=/var/lib/pleroma | ||||||
| 
 | 
 | ||||||
| RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\ | RUN apk update &&\ | ||||||
| 	apk update &&\ |  | ||||||
| 	apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\ | 	apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\ | ||||||
| 	adduser --system --shell /bin/false --home ${HOME} pleroma &&\ | 	adduser --system --shell /bin/false --home ${HOME} pleroma &&\ | ||||||
| 	mkdir -p ${DATA}/uploads &&\ | 	mkdir -p ${DATA}/uploads &&\ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 lain
						lain