--- rpms/smeserver-docker/contribs10/smeserver-docker.spec	2022/03/10 16:53:42	1.2
+++ rpms/smeserver-docker/contribs10/smeserver-docker.spec	2023/07/27 13:50:53	1.7
@@ -1,6 +1,6 @@
 %define name smeserver-docker
 %define version 0.4
-%define release 2%{?dist}
+%define release 7%{?dist}
 Summary: Contrib to manage basic docker setup
 Name: %{name}
 Version: %{version}
@@ -10,6 +10,11 @@ URL: http://www.docker.com/
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-docker-0.4-containerd-db-entry.patch
+Patch2: smeserver-docker-0.4-update-createlinks1.patch
+Patch3: smeserver-docker-0.4-docker-compose-template.patch
+Patch4: smeserver-docker-0.4-daemon-json-update.patch
+Patch5: smeserver-docker-0.4-docker-compose-template-begin.patch
+Patch6: smeserver-docker-0.4-docker-compose-template-add-newline.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
@@ -22,8 +27,28 @@ AutoReqProv: no
 Docker is an open-source project that automates the deployment of applications inside software containers
 
 %changelog
+* Thu Jul 27 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-7.sme
+- Add newline to 01version temnplate [SME: 11892]
+
+* Wed Jul 26 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-6.sme
+- add docker-compose.yml template-begin [SME: 11892]
+- fix compose templates for version 2
+
+* Tue Oct 11 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-5.sme
+- Fix daemon.json syntax [SME: 11892]
+- Add template-begin files
+- Thanks to Greg Zartman for finding these
+
+* Wed Jul 13 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-4.sme
+- Add docker-compose.yml template [SME: 11892]
+- smeserver-docker-compose-update event to expand the compose file
+
+* Tue Jul 12 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-3.sme
+- Fix some createlink errors [SME: 11892]
+- Update daemon.json and 50koozali.conf templates
+
 * Thu Mar 10 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-2.sme
-- Add containerd db entries
+- Add containerd db entries [SME: 11892]
 
 * Thu Mar 10 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-1.sme
 - First import to Koozali SME Server v10 [SME: 11892]
@@ -55,9 +80,15 @@ Docker is an open-source project that au
 - removed httpd templates - need to create your own
 
 %prep
+
 %setup
 
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -82,12 +113,46 @@ rm -rf %{name}-%{version}
 %preun
 %post
 
-# Add configs directory if it doesn't exist
+# Add config directories if they don't exist
 if [[ ! -d /home/e-smith/files/docker/configs ]]; then
-mkdir -p /home/e-smith/files/docker/configs;
+    mkdir -p /home/e-smith/files/docker/configs;
+fi
+
+if [[ ! -d /usr/lib/systemd/system/docker.service.d ]]; then
+    mkdir -p /usr/lib/systemd/system/docker.service.d;
 fi
 
+if [[ ! -d /etc/docker ]]; then
+    mkdir -p /etc/docker;
+fi
+
+# Remove the errant dir in the source
+if [[ -d /home/e-smith/files/docker/configs/docker-compose.yml ]]; then
+    rm -rf /home/e-smith/files/docker/configs/docker-compose.yml;
+fi
+
+
+echo ""
+echo "###################################################"
+echo "*"
 echo "see https://wiki.contribs.org/Docker"
+echo "*"
+echo "###################################################"
+echo ""
+echo "###################################################"
+echo "*"
+echo "Please run signal-post-upgrade;signal-event reboot"
+echo "*"
+echo "###################################################"
+echo ""
+echo "###################################################"
+echo "*"
+echo "Docker compose:"
+echo "curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose"
+echo "chmod 0700 /usr/local/bin/docker-compose"
+echo "chgrp docker /usr/local/bin/docker-compose"
+echo "*"
+echo "###################################################"
 
 %postun
 #/sbin/e-smith/expand-template /etc/rc.d/init.d/masq