From e20f8f96bb021b2767b42d889638836e3abad5d7 Mon Sep 17 00:00:00 2001
From: Alexander Stefanov <astefanov@virtuozzo.com>
Date: Sun, 24 Feb 2019 18:20:10 +0300
Subject: [PATCH] add rosa builder

---
 Dockerfile.builder  | 25 +++++++++----------------
 config-generator.sh |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Dockerfile.builder b/Dockerfile.builder
index 52bcd29..410a1d5 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,26 +1,19 @@
-FROM openmandriva/3.0
-#FROM openmandriva/cooker-aarch64
-#FROM openmandriva/cooker-armv7hl
-# replace me with armv7hl, aarch64
-ENV RARCH x86_64
+FROM rosalab/rosa2016.1
 
 RUN urpmi --auto --auto-update --no-verify-rpm \
  && rm -f /etc/localtime \
  && ln -s /usr/share/zoneinfo/UTC /etc/localtime \
- && gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \
- && urpmi --no-suggests --no-verify-rpm --auto mock-urpm git curl sudo builder-c \
+ && urpmi.addmedia builder http://abf-downloads.rosalinux.ru/import_personal/container/2963165/x86_64/main/release/ \
+ && urpmi --no-suggests --no-verify-rpm --auto mock-urpm git curl sudo builder-c xz \
+ && sed -i 's!openmandriva.org!rosalinux.ru!g' /etc/builder-c/filestore_upload.sh \
  && sed -i -e "s/Defaults    requiretty.*/ #Defaults    requiretty/g" /etc/sudoers \
- && echo "%mock-urpm ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
+ && groupadd mock \
+ && echo "%mock ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
  && adduser omv \
- && usermod -a -G mock-urpm omv \
- && chown -R omv:mock-urpm /etc/mock-urpm \
+ && usermod -a -G mock omv \
+ && chown -R omv:mock /etc/mock-urpm \
  && rm -rf /var/cache/urpmi/rpms/* \
  && rm -rf /usr/share/man/ /usr/share/cracklib /usr/share/doc
 
-RUN if [ $RARCH = "x86_64" ]; then urpmi --auto --no-verify-rpm qemu-static-aarch64 qemu-static-arm; fi
-
-## put me in RUN if you have more than 16gb of RAM
-# && echo "tmpfs /var/lib/mock-urpm/ tmpfs defaults,size=4096m,uid=$(id -u omv),gid=$(id -g omv),mode=0700 0 0" >> /etc/fstab \
-#
-
+COPY builder.conf /etc/builder-c/
 ENTRYPOINT ["/usr/bin/builder"]
diff --git a/config-generator.sh b/config-generator.sh
index 5e5026c..79a5b10 100755
--- a/config-generator.sh
+++ b/config-generator.sh
@@ -51,7 +51,7 @@ fi
 
 cat <<EOF>> $default_cfg
 config_opts['root'] = '$platform_name-$platform_arch'
-config_opts['chroot_setup'] = 'basesystem-minimal basesystem-build'
+config_opts['chroot_setup'] = 'basesystem-minimal basesystem-build xz'
 #config_opts['urpm_options'] = '--xml-info=never $extra_cfg_urpm_options'
 
 # If it's True - current urpmi configs will be copied to the chroot.