From 7e585725e384af08993b101cff1715783136a375 Mon Sep 17 00:00:00 2001
From: root <root@worker11.grid.cesnet.cz>
Date: Thu, 19 Jan 2023 09:15:05 +0100
Subject: [PATCH] Pridani balicku pro image vhodny pro beh v OOD
---
.gitlab-ci.yml | 4 ++--
bullseye/create_meta_debian | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3464e91..ba2dd1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
image: alpine:3.12
variables:
- DEST1: ${CI_REGISTRY_IMAGE}:bullseye
- DEST2: ${CI_REGISTRY_IMAGE}:latest
+ DEST1: ${CI_REGISTRY_IMAGE}:bullseye-ood
+ DEST2: ${CI_REGISTRY_IMAGE}:latest-ood
build image:
stage: build
diff --git a/bullseye/create_meta_debian b/bullseye/create_meta_debian
index 0d121bd..32a7572 100755
--- a/bullseye/create_meta_debian
+++ b/bullseye/create_meta_debian
@@ -28,6 +28,16 @@ for i in ${CANNOT_INSTALL[*]}; do sed -i "s/^$i$//" packages_file; done
apt install -y `cat packages_file` ./openafs-modules-*
+# X Apps
+apt install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -yqqq nmap ncat websockify xfce4 dbus-x11 xfce4-terminal ristretto mousepad midori firefox-esr
+
+# TturboVNC inside image
+cd /usr/src
+wget "https://downloads.sourceforge.net/project/turbovnc/3.0.2/turbovnc_3.0.2_amd64.deb"
+dpkg -i turbovnc_3.0.2_amd64.deb
+rm -rf turbovnc_3.0.2_amd64.deb
+cd -
+
cp krb5.conf /etc
cp idmapd.conf /etc
cp -r auto.master.d /etc
--
GitLab