Reflect Postfix 3.3 and json-c (PostGIS) propagation to main repo

This commit is contained in:
Disassembler 2018-07-09 18:12:53 +02:00
parent 5a0a00f296
commit 5d0928f2aa
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
2 changed files with 5 additions and 8 deletions

View File

@ -5,10 +5,8 @@ RUN \
# Create OS user (which will be picked up later by apk add) # Create OS user (which will be picked up later by apk add)
addgroup -S -g 587 postfix \ addgroup -S -g 587 postfix \
&& adduser -S -u 587 -h /var/spool/postfix -s /bin/false -g postfix -G postfix postfix \ && adduser -S -u 587 -h /var/spool/postfix -s /bin/false -g postfix -G postfix postfix \
# Add edge/main repository # Install Postfix
&& echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories \ && apk --no-cache add ca-certificates postfix \
# Install Postfix 3.3
&& apk --no-cache add ca-certificates postfix@edge \
# Build aliases database # Build aliases database
&& newaliases \ && newaliases \
# Cleanup # Cleanup

View File

@ -6,10 +6,9 @@ RUN \
sed -i 's/postgres:x:70:70/postgres:x:5432:5432/' /etc/passwd \ sed -i 's/postgres:x:70:70/postgres:x:5432:5432/' /etc/passwd \
&& sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group \ && sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group \
# Add edge/testing repository for postgis support # Add edge/testing repository for postgis support
&& echo '@edgetest http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \ && echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
&& echo '@edgemain http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories \ # Install PostgreSQL + PostGIS
# Install PostgreSQL + PostGIS (JSON-C is a dependency for PostGIS) && apk --no-cache add postgresql postgresql-contrib postgis@edge \
&& apk --no-cache add json-c@edgemain postgresql postgresql-contrib postgis@edgetest \
# Create socket directory # Create socket directory
&& mkdir /run/postgresql \ && mkdir /run/postgresql \
&& chown postgres:postgres /run/postgresql && chown postgres:postgres /run/postgresql