Parameterize build on Devuan suite name
This commit is contained in:
parent
28f6fb574c
commit
6a1214b6fc
|
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
DEBIAN_VERSION: jessie-20170723
|
DEBIAN_VERSION: jessie-20170723
|
||||||
|
DEVUAN_SUITE: jessie
|
||||||
TZ: UTC
|
TZ: UTC
|
||||||
LC_ALL: C
|
LC_ALL: C
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,12 @@ apt-get update
|
||||||
apt-get install debootstrap -q -y
|
apt-get install debootstrap -q -y
|
||||||
|
|
||||||
rootfs=$PWD/rootfs
|
rootfs=$PWD/rootfs
|
||||||
|
suite=$1
|
||||||
|
|
||||||
debootstrap \
|
debootstrap \
|
||||||
--force-check-gpg \
|
--force-check-gpg \
|
||||||
--no-merged-usr \
|
--no-merged-usr \
|
||||||
--variant=minbase jessie $rootfs
|
--variant=minbase $suite $rootfs
|
||||||
|
|
||||||
mount -t devpts devpts $rootfs/dev/pts
|
mount -t devpts devpts $rootfs/dev/pts
|
||||||
|
|
||||||
|
|
|
||||||
9
build.sh
9
build.sh
|
|
@ -5,6 +5,7 @@
|
||||||
# License: GPL-3.0+
|
# License: GPL-3.0+
|
||||||
|
|
||||||
MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated
|
MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated
|
||||||
|
SUITE=$DEVUAN_SUITE
|
||||||
|
|
||||||
rm -rf rootfs || true
|
rm -rf rootfs || true
|
||||||
|
|
||||||
|
|
@ -13,7 +14,7 @@ docker run --rm \
|
||||||
--cap-add SYS_ADMIN \
|
--cap-add SYS_ADMIN \
|
||||||
--volume $PWD:/devuan \
|
--volume $PWD:/devuan \
|
||||||
--workdir /devuan \
|
--workdir /devuan \
|
||||||
$MIGRATED_IMAGE ./bootstrap.sh
|
$MIGRATED_IMAGE ./bootstrap.sh $SUITE
|
||||||
|
|
||||||
IMAGE=$CI_REGISTRY_IMAGE
|
IMAGE=$CI_REGISTRY_IMAGE
|
||||||
STAMP=$(date +%F)
|
STAMP=$(date +%F)
|
||||||
|
|
@ -27,7 +28,7 @@ EOF
|
||||||
docker build -t $IMAGE:$STAMP .
|
docker build -t $IMAGE:$STAMP .
|
||||||
|
|
||||||
docker push $IMAGE:$STAMP
|
docker push $IMAGE:$STAMP
|
||||||
docker tag $IMAGE:$STAMP $IMAGE:jessie
|
docker tag $IMAGE:$STAMP $IMAGE:$SUITE
|
||||||
docker push $IMAGE:jessie
|
docker push $IMAGE:$SUITE
|
||||||
docker tag $IMAGE:jessie $IMAGE
|
docker tag $IMAGE:$SUITE $IMAGE
|
||||||
docker push $IMAGE
|
docker push $IMAGE
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@
|
||||||
#
|
#
|
||||||
# License: GPL-3.0+
|
# License: GPL-3.0+
|
||||||
|
|
||||||
BASE_IMAGE=$CI_REGISTRY_IMAGE:jessie
|
SUITE=$DEVUAN_SUITE
|
||||||
|
BASE_IMAGE=$CI_REGISTRY_IMAGE:$SUITE
|
||||||
|
|
||||||
IMAGE=$CI_REGISTRY_IMAGE/builder
|
IMAGE=$CI_REGISTRY_IMAGE/builder
|
||||||
STAMP=$(date +%F)
|
STAMP=$(date +%F)
|
||||||
|
|
@ -15,7 +16,7 @@ docker build \
|
||||||
--file $(basename $IMAGE).df .
|
--file $(basename $IMAGE).df .
|
||||||
|
|
||||||
docker push $IMAGE:$STAMP
|
docker push $IMAGE:$STAMP
|
||||||
docker tag $IMAGE:$STAMP $IMAGE:jessie
|
docker tag $IMAGE:$STAMP $IMAGE:$SUITE
|
||||||
docker push $IMAGE:jessie
|
docker push $IMAGE:$SUITE
|
||||||
docker tag $IMAGE:jessie $IMAGE
|
docker tag $IMAGE:$SUITE $IMAGE
|
||||||
docker push $IMAGE
|
docker push $IMAGE
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,11 @@ LABEL maintainer="Olaf Meeuwissen <paddy-hack@member.fsf.org>"
|
||||||
|
|
||||||
COPY ./repository@devuan.org.asc /tmp/
|
COPY ./repository@devuan.org.asc /tmp/
|
||||||
|
|
||||||
|
ARG SUITE
|
||||||
RUN url=http://auto.mirror.devuan.org/merged \
|
RUN url=http://auto.mirror.devuan.org/merged \
|
||||||
&& echo "deb $url jessie main" > /etc/apt/sources.list \
|
&& echo "deb $url $SUITE main" > /etc/apt/sources.list \
|
||||||
&& echo "deb $url jessie-updates main" >> /etc/apt/sources.list \
|
&& echo "deb $url $SUITE-updates main" >> /etc/apt/sources.list \
|
||||||
&& echo "deb $url jessie-security main" >> /etc/apt/sources.list \
|
&& echo "deb $url $SUITE-security main" >> /etc/apt/sources.list \
|
||||||
&& find /etc/apt/sources.list.d -type f -delete \
|
&& find /etc/apt/sources.list.d -type f -delete \
|
||||||
&& apt-key add /tmp/repository@devuan.org.asc \
|
&& apt-key add /tmp/repository@devuan.org.asc \
|
||||||
&& apt-get update -q \
|
&& apt-get update -q \
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ STAMP=$(date +%F)
|
||||||
docker pull $IMAGE || true
|
docker pull $IMAGE || true
|
||||||
docker build \
|
docker build \
|
||||||
--build-arg VERSION=$DEBIAN_VERSION \
|
--build-arg VERSION=$DEBIAN_VERSION \
|
||||||
|
--build-arg SUITE=$DEVUAN_SUITE \
|
||||||
--tag $IMAGE:$STAMP \
|
--tag $IMAGE:$STAMP \
|
||||||
--file migrate.df .
|
--file migrate.df .
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue