Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Switch edge repositories to spotter

Browse Source
This commit is contained in:
Disassembler 2019-06-02 11:31:24 +02:00
parent b556ee3c30
commit 9d0e30f728
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
8 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_vm/etc/apk/repositories
View File

@ -1,4 +1,3 @@
http://dl-cdn.alpinelinux.org/alpine/v3.9/main http://dl-cdn.alpinelinux.org/alpine/v3.9/main
http://dl-cdn.alpinelinux.org/alpine/v3.9/community http://dl-cdn.alpinelinux.org/alpine/v3.9/community
@et http://dl-cdn.alpinelinux.org/alpine/edge/testing @vm http://repo.spotter.cz/apk
@vm https://repo.spotter.cz/apk

2
lxc-apps/ckan/lxcfile
View File

@ -5,7 +5,7 @@ LAYER ckan/ckan
RUN EOF RUN EOF
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add geos@et libjpeg-turbo libmagic libpq mailcap py2-pip zlib apk --no-cache add geos 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

2
lxc-apps/cts/lxcfile
View File

@ -5,7 +5,7 @@ LAYER cts/cts
RUN EOF RUN EOF
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add geos@et libpq nginx zlib apk --no-cache add geos 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

2
lxc-apps/sahana-shared/lxcfile
View File

@ -5,7 +5,7 @@ LAYER shared/sahana
RUN EOF RUN EOF
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add geos@et nginx py-gdal@et py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python apk --no-cache add geos nginx py-gdal 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

2
lxc-services/postgres/lxcfile
View File

@ -8,7 +8,7 @@ RUN EOF
sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group
# Install PostgreSQL + PostGIS # Install PostgreSQL + PostGIS
apk --no-cache add postgresql postgresql-contrib postgis@et apk --no-cache add postgresql postgresql-contrib postgis
# Create socket directory # Create socket directory
mkdir /run/postgresql mkdir /run/postgresql

2
lxc-services/rabbitmq/lxcfile
View File

@ -8,7 +8,7 @@ RUN EOF
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
# Install RabbitMQ # Install RabbitMQ
apk --no-cache add rabbitmq-server@et apk --no-cache add rabbitmq-server
EOF EOF
MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia

8
lxc-shared/alpine3.8/lxcfile
View File

@ -3,14 +3,12 @@ LAYER shared/alpine3.8
COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.8/x86_64/versions/library-3.8/x86_64/rootfs.tar.xz COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.8/x86_64/versions/library-3.8/x86_64/rootfs.tar.xz
RUN EOF RUN EOF
# Add edge/testing repository # Add spotter repository
echo '@em http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories echo 'http://repo.spotter.cz/apk' >>/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
# Update packages # Update packages
apk --no-cache upgrade apk --no-cache upgrade
# Install s6 supervisor # Install s6 supervisor
apk --no-cache add libxml2 libxslt s6@em apk --no-cache add libxml2 libxslt s6
EOF EOF

6
lxc-shared/alpine3.9/lxcfile
View File

@ -3,10 +3,8 @@ LAYER shared/alpine3.9
COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.9/x86_64/versions/library-3.9/x86_64/rootfs.tar.xz COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.9/x86_64/versions/library-3.9/x86_64/rootfs.tar.xz
RUN EOF RUN EOF
# Add edge/testing repository # Add spotter repository
echo '@em http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories echo 'http://repo.spotter.cz/apk' >>/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
# Update packages # Update packages
apk --no-cache upgrade apk --no-cache upgrade