From a7c85af7cca1beb5af18d6b5e9a55a8b52fa4016 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Wed, 5 Jun 2019 09:33:28 +0200 Subject: [PATCH] Reintroduce repo tagging --- _build/build-all.sh | 4 ++-- _build/etc/abuild.conf | 2 +- _vm/etc/apk/repositories | 2 +- lxc-apps/ckan/lxcfile | 2 +- lxc-apps/cts/lxcfile | 2 +- lxc-apps/sahana-shared/lxcfile | 2 +- lxc-services/postgres/lxcfile | 2 +- lxc-services/rabbitmq/lxcfile | 2 +- lxc-shared/alpine3.9/lxc/etc/apk/repositories | 3 +++ lxc-shared/alpine3.9/lxcfile | 7 ++----- 10 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 lxc-shared/alpine3.9/lxc/etc/apk/repositories diff --git a/_build/build-all.sh b/_build/build-all.sh index 21f1481..b93bd16 100755 --- a/_build/build-all.sh +++ b/_build/build-all.sh @@ -20,7 +20,7 @@ apk add swig python2-dev abuild -F 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 cd ${ROOT}/apk/proj4 @@ -31,7 +31,7 @@ apk add elixir erlang-compiler erlang-dev erlang-edoc erlang-eldap erlang-erl-do abuild -F 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 cd ${ROOT}/apk/vmmgr diff --git a/_build/etc/abuild.conf b/_build/etc/abuild.conf index 55a62cf..e36f1f7 100644 --- a/_build/etc/abuild.conf +++ b/_build/etc/abuild.conf @@ -14,7 +14,7 @@ SRCDEST=/var/cache/distfiles # uncomment line below to store built packages in other location # The package will be stored as $REPODEST/$repo/$pkgname-$pkgver-r$pkgrel.apk # 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 # the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively. diff --git a/_vm/etc/apk/repositories b/_vm/etc/apk/repositories index 82f3c48..0904bd9 100644 --- a/_vm/etc/apk/repositories +++ b/_vm/etc/apk/repositories @@ -1,3 +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/apk +@vm http://repo.spotter.cz/alpine/v3.9/apk diff --git a/lxc-apps/ckan/lxcfile b/lxc-apps/ckan/lxcfile index fb7162a..95175bb 100644 --- a/lxc-apps/ckan/lxcfile +++ b/lxc-apps/ckan/lxcfile @@ -5,7 +5,7 @@ LAYER ckan/ckan RUN EOF # 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 apk --no-cache add --virtual .deps build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev diff --git a/lxc-apps/cts/lxcfile b/lxc-apps/cts/lxcfile index 19a1d82..d746230 100644 --- a/lxc-apps/cts/lxcfile +++ b/lxc-apps/cts/lxcfile @@ -5,7 +5,7 @@ LAYER cts/cts RUN EOF # Install runtime dependencies - apk --no-cache add geos libpq nginx zlib + apk --no-cache add geos@vm libpq nginx zlib # Install build dependencies apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev diff --git a/lxc-apps/sahana-shared/lxcfile b/lxc-apps/sahana-shared/lxcfile index 540537c..5597048 100644 --- a/lxc-apps/sahana-shared/lxcfile +++ b/lxc-apps/sahana-shared/lxcfile @@ -5,7 +5,7 @@ LAYER shared/sahana RUN EOF # 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 apk --no-cache add --virtual .deps build-base git freetype-dev libpng-dev py-numpy-dev py2-pip python2-dev ttf-dejavu diff --git a/lxc-services/postgres/lxcfile b/lxc-services/postgres/lxcfile index 8790937..e398f79 100644 --- a/lxc-services/postgres/lxcfile +++ b/lxc-services/postgres/lxcfile @@ -8,7 +8,7 @@ RUN EOF sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group # Install PostgreSQL + PostGIS - apk --no-cache add postgresql postgresql-contrib postgis + apk --no-cache add postgresql postgresql-contrib postgis@vm # Create socket directory mkdir /run/postgresql diff --git a/lxc-services/rabbitmq/lxcfile b/lxc-services/rabbitmq/lxcfile index dbad1d6..ddeb5c6 100644 --- a/lxc-services/rabbitmq/lxcfile +++ b/lxc-services/rabbitmq/lxcfile @@ -8,7 +8,7 @@ RUN EOF adduser -S -u 5672 -h /usr/lib/rabbitmq -s /bin/false -g rabbitmq -G rabbitmq rabbitmq # Install RabbitMQ - apk --no-cache add rabbitmq-server + apk --no-cache add rabbitmq-server@vm EOF MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia diff --git a/lxc-shared/alpine3.9/lxc/etc/apk/repositories b/lxc-shared/alpine3.9/lxc/etc/apk/repositories new file mode 100644 index 0000000..0904bd9 --- /dev/null +++ b/lxc-shared/alpine3.9/lxc/etc/apk/repositories @@ -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 diff --git a/lxc-shared/alpine3.9/lxcfile b/lxc-shared/alpine3.9/lxcfile index 25c0f6f..9017dba 100644 --- a/lxc-shared/alpine3.9/lxcfile +++ b/lxc-shared/alpine3.9/lxcfile @@ -2,15 +2,12 @@ IMAGE build 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 -RUN EOF - # Add spotter repository - echo 'http://repo.spotter.cz/apk' >>/etc/apk/repositories +COPY lxc +RUN EOF # Update packages apk --no-cache upgrade # Install s6 supervisor apk --no-cache add libxml2 libxslt s6 EOF - -COPY lxc