From b423324a75023fd541718ade81bb5b868d6df1b9 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Tue, 19 Dec 2023 13:55:34 +0100 Subject: [PATCH] packages as steps --- .drone.jsonnet | 80 +++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 59f1fb8..44c1c37 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,54 +1,46 @@ local dirs = ['_CI-CD', 'apps']; -local packages = ['debian-stable','debian-testing','debian-stable-build-essential','debian-golang','debian-stable-php-fpm','distcc']; +local packages = ['debian-stable', 'debian-testing', 'debian-stable-build-essential', 'debian-golang', 'debian-stable-php-fpm', 'distcc']; local apps = ['apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter']; local build(dir, package) = { - name: '%(package)s' % { package: package }, - image: 'plugins/docker', - settings: { - context: '%(dir)s/%(package)s' % { dir: dir, package: package }, - dockerfile: '%(dir)s/%(package)s/Dockerfile' % { dir: dir, package: package }, - registry: 'http://cr.wks', - insecure: 'true', - tags: ['latest'], - repo: 'cr.wks/%(package)s' % { package: package } - } + name: '%(package)s' % { package: package }, + image: 'plugins/docker', + settings: { + context: '%(dir)s/%(package)s' % { dir: dir, package: package }, + dockerfile: '%(dir)s/%(package)s/Dockerfile' % { dir: dir, package: package }, + registry: 'http://cr.wks', + insecure: 'true', + tags: ['latest'], + repo: 'cr.wks/%(package)s' % { package: package }, + }, }; [ -{ -kind: 'pipeline', -type: 'docker', -name: '_CI-CD', -platform: { - os: 'linux', - arch: 'arm64' -}, - steps: [ { - -std.flattenArrays([ + { + kind: 'pipeline', + type: 'docker', + name: '_CI-CD', + platform: { + os: 'linux', + arch: 'arm64', + }, + steps: [ build('_CI-CD', pkg) - for pkg in packages - -]) - -}]}, - -{ -kind: 'pipeline', -type: 'docker', -name: 'apps', -platform: { - os: 'linux', - arch: 'arm64' -}, - steps: [ { - -std.flattenArrays([ + for pkg in packages + ], + }, + { + kind: 'pipeline', + type: 'docker', + name: 'apps', + platform: { + os: 'linux', + arch: 'arm64', + }, + steps: [ build('apps', app) - for app in apps -]) - -}]}, -] \ No newline at end of file + for app in apps + ], + }, +]