Include edge repos in basic alpine image

This commit is contained in:
Disassembler 2018-09-21 09:17:19 +02:00
parent 00eff6fa85
commit 74b7d9478f
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
6 changed files with 12 additions and 21 deletions

View File

@ -2,5 +2,11 @@ IMAGE build
LAYER shared/alpine LAYER shared/alpine
RUN EOF RUN EOF
apk --no-cache add s6 # Add edge/testing repository
echo '@em http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories
echo '@et http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
echo '@ec http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories
# Install s6 supervisor
apk --no-cache add s6@em
EOF EOF

View File

@ -5,11 +5,8 @@ LAYER shared/python2
LAYER ckan/ckan LAYER ckan/ckan
RUN EOF RUN EOF
# Add edge/testing repository
echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add geos@edge libjpeg-turbo libmagic libpq mailcap py2-pip zlib apk --no-cache add geos@et libjpeg-turbo libmagic libpq mailcap py2-pip zlib
# Install build dependencies # Install build dependencies
apk --no-cache add --virtual .deps build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev apk --no-cache add --virtual .deps build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev

View File

@ -5,11 +5,8 @@ LAYER shared/python2
LAYER cts/cts LAYER cts/cts
RUN EOF RUN EOF
# Add edge/testing repository
echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add geos@edge libpq nginx zlib apk --no-cache add geos@et libpq nginx zlib
# Install build dependencies # Install build dependencies
apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev

View File

@ -7,11 +7,8 @@ RUN EOF
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
echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
# Install PostgreSQL + PostGIS # Install PostgreSQL + PostGIS
apk --no-cache add postgresql postgresql-contrib postgis@edge apk --no-cache add postgresql postgresql-contrib postgis@et
# Create socket directory # Create socket directory
mkdir /run/postgresql mkdir /run/postgresql

View File

@ -7,11 +7,8 @@ RUN EOF
addgroup -S -g 5672 rabbitmq addgroup -S -g 5672 rabbitmq
adduser -S -u 5672 -h /usr/lib/rabbitmq -s /bin/false -g rabbitmq -G rabbitmq rabbitmq adduser -S -u 5672 -h /usr/lib/rabbitmq -s /bin/false -g rabbitmq -G rabbitmq rabbitmq
# Add edge/testing repository
echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
# Install RabbitMQ # Install RabbitMQ
apk --no-cache add rabbitmq-server@edge apk --no-cache add rabbitmq-server@et
EOF EOF
MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia

View File

@ -5,11 +5,8 @@ LAYER shared/python2
LAYER sahana/sahana LAYER sahana/sahana
RUN EOF RUN EOF
# Add edge/testing repository
echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add geos@edge nginx py-gdal@edge py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python apk --no-cache add geos@et nginx py-gdal@et py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python
# Install build dependencies # Install build dependencies
apk --no-cache add --virtual .deps build-base git freetype-dev libpng-dev py-numpy-dev py2-pip python2-dev ttf-dejavu apk --no-cache add --virtual .deps build-base git freetype-dev libpng-dev py-numpy-dev py2-pip python2-dev ttf-dejavu