diff options
| -rw-r--r-- | kiwi/.gitignore | 2 | ||||
| -rw-r--r-- | kiwi/Makefile | 38 | ||||
| -rw-r--r-- | kiwi/adei/config.xml.69 | 53 |
3 files changed, 85 insertions, 8 deletions
diff --git a/kiwi/.gitignore b/kiwi/.gitignore new file mode 100644 index 0000000..fe78a6c --- /dev/null +++ b/kiwi/.gitignore @@ -0,0 +1,2 @@ +.dice +build/ diff --git a/kiwi/Makefile b/kiwi/Makefile index f8f7497..c83d56a 100644 --- a/kiwi/Makefile +++ b/kiwi/Makefile @@ -1,19 +1,41 @@ -all: build/microadei.x86_64-0.10.1.docker.tar.xz +version := 0.10.1 +kiwi := "kiwi-ng" +dice := "dice" +suse := $(shell sh -c '[ -f /etc/SUSE-brand ] && echo "suse"') + +ifeq ($(suse), "suse") + image := "microadei.x86_64-$(version).docker.tar.xz" +else + image := "microadei.x86_64-$(version)-DiceBuild.docker.tar.xz" +endif + +.PHONY: import push clean run + +all: build/$(image) install: push -build/microadei.x86_64-0.10.1.docker.tar.xz: adei/config.xml adei/config.sh - rm -rf build/* - kiwi --type docker system build --description adei/ --target-dir ./build/ - du -sm build/build +build/$(image): adei/config.xml adei/config.sh + mkdir -p build ;\ + rm -rf build/* ;\ + if [ "$(suse)" = "suse" ]; then \ + $(kiwi) --type docker system build --description adei/ --target-dir ./build/ ;\ + du -sm build/build ;\ + else \ + $(dice) build adei ;\ + tar xf adei/.dice/build_results.tar -C build/ ;\ + fi -import: build/microadei.x86_64-0.10.1.docker.tar.xz - docker load < build/microadei.x86_64-0.10.1.docker.tar.xz +import: build/$(image) + docker load < build/$(image) push: import docker push chsa/microadei:latest clean: - rm -rf build/* + rm -rf build/* adei/.dice + +#check: adei/config.xml +# jing /usr/lib64/python3*/site-packages/kiwi/schema/kiwi.rng adei/config.xml run: docker run -it chsa/microadei:latest /bin/bash diff --git a/kiwi/adei/config.xml.69 b/kiwi/adei/config.xml.69 new file mode 100644 index 0000000..a5f725c --- /dev/null +++ b/kiwi/adei/config.xml.69 @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="6.9" name="microadei"> + <description type="system"> + <author>Suren A. Chilingaryan</author> + <contact>csa@suren.me</contact> + <specification>Minimal ADEI container</specification> + </description> + <preferences> + <type image="docker"> + <containerconfig + name="chsa/microadei" + tag="latest" + maintainer="Suren A. Chilingaryan"/> + </type> + <version>0.10.1</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-excludedocs>true</rpm-excludedocs> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users> + <user home="/root" name="root" groups="root" password="aliluya"/> + </users> + <repository type="rpm-md" alias="kiwi" priority="1"> + <source path="obs://Virtualization:Appliances:Builder/openSUSE_Leap_42.3"/> + </repository> + <repository type="rpm-md" alias="Leap_42_3" imageinclude="true"> + <source path="obs://openSUSE:Leap:42.3/standard"/> + </repository> + <repository type="rpm-md" alias="ADEI" imageinclude="true"> + <source path="obs://home:/csa7fff:/adei/openSUSE_Leap_42.3/"/> + </repository> + + <packages type="bootstrap"> + <package name="udev"/> + <package name="filesystem"/> + <package name="ca-certificates"/> + <package name="openSUSE-release"/> + <package name="krb5-mini"/> + </packages> + <packages type="image"> + <package name="coreutils"/> + <package name="iputils"/> + <package name="openSUSE-build-key"/> + <package name="openSUSE-release"/> + <package name="openSUSE-release-ftp"/> + <package name="adei-req-cron"/> + <package name="adei-req-mssql"/> + <package name="glibc-locale"/> + </packages> +</image> |