From 2a3761a559e574158c357bcd627b9f2ff1931a23 Mon Sep 17 00:00:00 2001 From: Charles Wyble Date: Sat, 27 Apr 2024 14:08:02 -0500 Subject: [PATCH] refactored to use external files and per host --- PullContainers.sh | 43 +++---------------------------------- tsys2/containersToMerge.txt | 2 ++ tsys2/tsys2-containers.txt | 14 ++++++++++++ tsys3/containersToMerge.txt | 15 +++++++++++++ tsys3/tsys3-containers.txt | 2 ++ 5 files changed, 36 insertions(+), 40 deletions(-) create mode 100644 tsys2/containersToMerge.txt create mode 100644 tsys2/tsys2-containers.txt create mode 100644 tsys3/containersToMerge.txt create mode 100644 tsys3/tsys3-containers.txt diff --git a/PullContainers.sh b/PullContainers.sh index bff87a2..401f3d5 100644 --- a/PullContainers.sh +++ b/PullContainers.sh @@ -1,43 +1,6 @@ #!/bin/bash -export container_list=" - elabftw/elabimg \ - huginn/huginn \ - phpipam/phpipam-www \ - killbill/killbill \ - killbill/kaui \ - inventree/inventree \ - seknox/trasa \ - beanbag/reviewboard:latest \ - pihole/pihole \ - stedolan/jq \ - r7wx/easy-gate \ - rundeck/rundeck \ - librenms/librenms \ - graylog/graylog:5.1 \ - r7wx/easy-gate \ - xetusoss/archiva" -for container in $container_list; +for container in $(cat ./($hostname -s)/$(hostname -s)-containers.txt; do - docker pull $container & -done - -#Mailpile -#easyforms (not a docker container) - -#TSYS3 (usb passthrough) -#git subtree add --prefix upstream/cloudflare-cfssl https://github.com/rjrivero/docker-cfssl.git master --squash -#git subtree add --prefix upstream/cloudflare-certmgr https://github.com/cloudflare/certmgr.git master --squash - -#Need to deep dive... -#git subtree add --prefix upstream/wazuh https://github.com/wazuh/wazuh-docker.git master --squash -#git subtree add --prefix upstream/openvas https://github.com/mikesplain/openvas-docker.git master --squash -# greenbone/vulnerability-tests \ -# greenbone/notus-data \ -# greenbone/scap-data \ -# securecompliance/gvm:debian-master-data-full \ -# securecompliance/gvm:debian-master-data \ -# securecompliance/gvm:debian-master-full \ -# securecompliance/gvm:debian-master \ -#mailman - + docker pull $container +done \ No newline at end of file diff --git a/tsys2/containersToMerge.txt b/tsys2/containersToMerge.txt new file mode 100644 index 0000000..83ac5cc --- /dev/null +++ b/tsys2/containersToMerge.txt @@ -0,0 +1,2 @@ +#mailpile +##mailman \ No newline at end of file diff --git a/tsys2/tsys2-containers.txt b/tsys2/tsys2-containers.txt new file mode 100644 index 0000000..824e48a --- /dev/null +++ b/tsys2/tsys2-containers.txt @@ -0,0 +1,14 @@ +elabftw/elabimg +huginn/huginn +phpipam/phpipam-www +killbill/killbill +killbill/kaui +inventree/inventree +beanbag/reviewboard:latest +pihole/pihole +rundeck/rundeck +librenms/librenms +graylog/graylog:5.1 +woodpeckerci/woodpeckerci-agent +r7wx/easy-gate +xetusoss/archiva \ No newline at end of file diff --git a/tsys3/containersToMerge.txt b/tsys3/containersToMerge.txt new file mode 100644 index 0000000..55e994c --- /dev/null +++ b/tsys3/containersToMerge.txt @@ -0,0 +1,15 @@ + +#git subtree add --prefix upstream/cloudflare-cfssl https://github.com/rjrivero/docker-cfssl.git master --squash +#git subtree add --prefix upstream/cloudflare-certmgr https://github.com/cloudflare/certmgr.git master --squash + +#Need to deep dive... +#git subtree add --prefix upstream/wazuh https://github.com/wazuh/wazuh-docker.git master --squash +#git subtree add --prefix upstream/openvas https://github.com/mikesplain/openvas-docker.git master --squash + +# greenbone/vulnerability-tests \ +# greenbone/notus-data \ +# greenbone/scap-data \ +# securecompliance/gvm:debian-master-data-full \ +# securecompliance/gvm:debian-master-data \ +# securecompliance/gvm:debian-master-full \ +# securecompliance/gvm:debian-master \ diff --git a/tsys3/tsys3-containers.txt b/tsys3/tsys3-containers.txt new file mode 100644 index 0000000..55054de --- /dev/null +++ b/tsys3/tsys3-containers.txt @@ -0,0 +1,2 @@ +pihole/pihole +woodpeckerci/woodpeckerci-agent \ No newline at end of file