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

Reintroduce repo tagging

Browse Source
This commit is contained in:
Disassembler 2019-06-05 09:33:28 +02:00
parent 6822f605d1
commit a7c85af7cc
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_build/build-all.sh
View File

@ -20,7 +20,7 @@ apk add swig python2-dev
abuild -F abuild -F
cd ${ROOT}/apk/gdal cd ${ROOT}/apk/gdal
apk add curl-dev geos-dev giflib-dev jpeg-dev libjpeg-turbo-dev libpng-dev linux-headers postgresql-dev python2-dev sqlite-dev swig tiff-dev zlib-dev apk add curl-dev geos-dev@vm giflib-dev jpeg-dev libjpeg-turbo-dev libpng-dev linux-headers postgresql-dev python2-dev sqlite-dev swig tiff-dev zlib-dev
abuild -F abuild -F
cd ${ROOT}/apk/proj4 cd ${ROOT}/apk/proj4
@ -31,7 +31,7 @@ apk add elixir erlang-compiler erlang-dev erlang-edoc erlang-eldap erlang-erl-do
abuild -F abuild -F
cd ${ROOT}/apk/postgis cd ${ROOT}/apk/postgis
apk add gdal-dev geos-dev json-c-dev libxml2-dev pcre-dev perl perl-dev postgresql postgresql-dev proj4-dev apk add gdal-dev@vm geos-dev@vm json-c-dev libxml2-dev pcre-dev perl perl-dev postgresql postgresql-dev proj4-dev@vm
abuild -F abuild -F
cd ${ROOT}/apk/vmmgr cd ${ROOT}/apk/vmmgr

2
_build/etc/abuild.conf
View File

@ -14,7 +14,7 @@ SRCDEST=/var/cache/distfiles
# uncomment line below to store built packages in other location # uncomment line below to store built packages in other location
# The package will be stored as $REPODEST/$repo/$pkgname-$pkgver-r$pkgrel.apk # The package will be stored as $REPODEST/$repo/$pkgname-$pkgver-r$pkgrel.apk
# where $repo is the name of the parent directory of $startdir. # where $repo is the name of the parent directory of $startdir.
REPODEST=/srv/build REPODEST=/srv/build/alpine/v3.9
# PACKAGER and MAINTAINER are used by newapkbuild when creating new aports for # PACKAGER and MAINTAINER are used by newapkbuild when creating new aports for
# the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively. # the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively.

2
_vm/etc/apk/repositories
View File

@ -1,3 +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
@vm http://repo.spotter.cz/apk @vm http://repo.spotter.cz/alpine/v3.9/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 libjpeg-turbo libmagic libpq mailcap py2-pip zlib apk --no-cache add geos@vm 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 libpq nginx zlib apk --no-cache add geos@vm 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 nginx py-gdal py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python apk --no-cache add geos@vm nginx py-gdal@vm 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 apk --no-cache add postgresql postgresql-contrib postgis@vm
# 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 apk --no-cache add rabbitmq-server@vm
EOF EOF
MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia

3
lxc-shared/alpine3.9/lxc/etc/apk/repositories Normal file
View File

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

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

@ -2,15 +2,12 @@ IMAGE build
LAYER shared/alpine3.9 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 COPY lxc
# Add spotter repository
echo 'http://repo.spotter.cz/apk' >>/etc/apk/repositories
RUN EOF
# 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 apk --no-cache add libxml2 libxslt s6
EOF EOF
COPY lxc