From 852c04930d464a51f1a827bb886d3cd646c08bd3 Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Sat, 19 Aug 2017 18:02:33 +0900 Subject: [PATCH] Pass suite as a command-line argument for builds and derived images This sets the stage for building multiple suites. Note that migration from Debian is not expected to work for multiple Devuan suites. --- .gitlab-ci.yml | 4 ++-- build.sh | 2 +- derive.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f93a15..bd70ca4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,9 +29,9 @@ migrate: build: stage: build script: - - ./build.sh + - ./build.sh "$DEVUAN_SUITE" derive: stage: derive script: - - ./derive.sh + - ./derive.sh "$DEVUAN_SUITE" diff --git a/build.sh b/build.sh index ad8b736..1691511 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ # License: GPL-3.0+ MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated -SUITE=$DEVUAN_SUITE +SUITE=$1 rm -rf rootfs || true diff --git a/derive.sh b/derive.sh index da9d53e..3610f98 100755 --- a/derive.sh +++ b/derive.sh @@ -4,7 +4,7 @@ # # License: GPL-3.0+ -SUITE=$DEVUAN_SUITE +SUITE=$1 BASE_IMAGE=$CI_REGISTRY_IMAGE:$SUITE IMAGE=$CI_REGISTRY_IMAGE/builder