From 80ddec6615b1fbf288f923b4667d6146369a16fa Mon Sep 17 00:00:00 2001
From: Renken <mail@renken.systems>
Date: Sat, 2 Apr 2022 15:27:25 +0200
Subject: [PATCH] gitmodules: update modules

---
 .gitmodules                                  |  2 +-
 cicd/docker_targets/coreutils/Dockerfile     |  3 -
 cicd/docker_targets/coreutils/Tagfile        |  1 -
 cicd/docker_targets/coreutils/bootstrap.sh   | 32 ----------
 cicd/docker_targets/sphinx_html/Dockerfile   |  3 -
 cicd/docker_targets/sphinx_html/Tagfile      |  1 -
 cicd/docker_targets/sphinx_html/bootstrap.sh | 64 --------------------
 cicd/style                                   |  2 +-
 8 files changed, 2 insertions(+), 106 deletions(-)
 delete mode 100644 cicd/docker_targets/coreutils/Dockerfile
 delete mode 100644 cicd/docker_targets/coreutils/Tagfile
 delete mode 100755 cicd/docker_targets/coreutils/bootstrap.sh
 delete mode 100644 cicd/docker_targets/sphinx_html/Dockerfile
 delete mode 100644 cicd/docker_targets/sphinx_html/Tagfile
 delete mode 100755 cicd/docker_targets/sphinx_html/bootstrap.sh

diff --git a/.gitmodules b/.gitmodules
index bd75922..067a357 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "cicd/style"]
 	path = cicd/style
-	url = ../../../template/util/style.git
+	url = https://gitlab.com/vermware/template/util/style.git
diff --git a/cicd/docker_targets/coreutils/Dockerfile b/cicd/docker_targets/coreutils/Dockerfile
deleted file mode 100644
index 786afdb..0000000
--- a/cicd/docker_targets/coreutils/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM debian:stretch
-ADD bootstrap.sh /
-RUN /bootstrap.sh && rm /bootstrap.sh
diff --git a/cicd/docker_targets/coreutils/Tagfile b/cicd/docker_targets/coreutils/Tagfile
deleted file mode 100644
index dee3c0b..0000000
--- a/cicd/docker_targets/coreutils/Tagfile
+++ /dev/null
@@ -1 +0,0 @@
-registry.git.mel.vin:443/shione/shione/cicd/coreutils:0.0
diff --git a/cicd/docker_targets/coreutils/bootstrap.sh b/cicd/docker_targets/coreutils/bootstrap.sh
deleted file mode 100755
index 2d6c23a..0000000
--- a/cicd/docker_targets/coreutils/bootstrap.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-DEBIAN=stretch
-
-set -e
-
-printf '%s\n' \
-	"deb http://ftp.debian.org/debian $DEBIAN-backports main" \
-	> /etc/apt/sources.list.d/$DEBIAN-backports.list
-
-apt-get update
-
-apt-get dist-upgrade -y
-
-# backported cmake requires backported libuv1
-apt-get install --no-install-recommends -y \
-	bash \
-	ca-certificates \
-	cmake/$DEBIAN-backports \
-	coreutils \
-	findutils \
-	git \
-	grep \
-	libuv1/$DEBIAN-backports \
-	make \
-	openssh-client \
-	rsync \
-	sed
-
-apt-get autoremove -y
-apt-get clean
-rm -rf /var/lib/apt/lists/*
diff --git a/cicd/docker_targets/sphinx_html/Dockerfile b/cicd/docker_targets/sphinx_html/Dockerfile
deleted file mode 100644
index 786afdb..0000000
--- a/cicd/docker_targets/sphinx_html/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM debian:stretch
-ADD bootstrap.sh /
-RUN /bootstrap.sh && rm /bootstrap.sh
diff --git a/cicd/docker_targets/sphinx_html/Tagfile b/cicd/docker_targets/sphinx_html/Tagfile
deleted file mode 100644
index 3fb6c15..0000000
--- a/cicd/docker_targets/sphinx_html/Tagfile
+++ /dev/null
@@ -1 +0,0 @@
-registry.git.mel.vin:443/shione/shione/cicd/sphinx_html:0.0
diff --git a/cicd/docker_targets/sphinx_html/bootstrap.sh b/cicd/docker_targets/sphinx_html/bootstrap.sh
deleted file mode 100755
index f24045a..0000000
--- a/cicd/docker_targets/sphinx_html/bootstrap.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-DEBIAN=stretch
-PLANTUML=master
-
-set -e
-
-printf '%s\n' \
-	"deb http://ftp.debian.org/debian $DEBIAN-backports main" \
-	> /etc/apt/sources.list.d/$DEBIAN-backports.list
-
-apt-get update
-
-apt-get dist-upgrade -y
-
-# backported cmake requires backported libuv1
-apt-get install --no-install-recommends -y \
-	ca-certificates \
-	cmake/$DEBIAN-backports \
-	curl \
-	default-jre-headless \
-	git \
-	graphviz \
-	libuv1/$DEBIAN-backports \
-	make \
-	python3-pip \
-	python3-setuptools \
-	python3-wheel
-
-# some font metapackages use recommends to install their subpackages
-apt-get install -y \
-	fonts-dejavu \
-	fonts-liberation \
-	fonts-noto
-
-ln -s /usr/bin/python3 /usr/local/bin/python
-ln -s /usr/bin/pip3 /usr/local/bin/pip
-
-pip install \
-	sphinx \
-	sphinx_rtd_theme \
-	sphinxcontrib-plantuml
-
-mkdir -p /opt/plantuml
-for i in batik-all-1.7.jar jlatexmath-minimal-1.0.3.jar jlm_cyrillic.jar \
-	jlm_greek.jar plantuml.jar
-do
-	curl -Lf \
-		-o /opt/plantuml/$i \
-		https://git.mel.vin/mirror/plantuml/raw/$PLANTUML/$i
-done
-
-printf '%s\n%s\n' \
-	'#!/bin/sh' \
-	'exec java -jar /opt/plantuml/plantuml.jar "$@"' \
-	> /usr/local/bin/plantuml
-chmod +x /usr/local/bin/plantuml
-
-apt-get purge -y \
-	curl
-
-apt-get autoremove -y
-apt-get clean
-rm -rf /var/lib/apt/lists/*
diff --git a/cicd/style b/cicd/style
index 68df132..fec71d3 160000
--- a/cicd/style
+++ b/cicd/style
@@ -1 +1 @@
-Subproject commit 68df132153b7892f80ea09e41f9ce15ebc68f5f8
+Subproject commit fec71d372cb198cb9e8521b54b2a6b19e5ef2aba