From 9106bbcd09d8a72fe96bfa25d3132ff5b3490027 Mon Sep 17 00:00:00 2001
From: pi-farm <meik@baum-hessen.de>
Date: Thu, 23 Nov 2023 16:58:35 +0100
Subject: [PATCH] tails-patch option added in menue

---
 .dockerignore      |  1 +
 docker-compose.yml | 30 +++++++++++++++---------------
 dockerfile         |  4 ++--
 start.sh           | 10 ++++++++++
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index d7ac81e..4612b37 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,6 @@
 .git
 .gitignore
 srv
+media
 RPi-PXE-Server
 
diff --git a/docker-compose.yml b/docker-compose.yml
index f679e8e..19fc88a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,18 +15,18 @@ services:
         container_name: pxe-container
         image: pxe-image
     
-    pxe-samba:
-        image: gists/samba-server
-        container_name: samba-server
-        ports:
-            - "0.0.0.0:137:137/udp"
-            - "0.0.0.0:138:138/udp"
-            - "0.0.0.0:139:139/tcp"
-            - "0.0.0.0:445:445/tcp"
-        volumes:
-            - ${PWD}/samba:/etc/samba
-            - ${PWD}/srv:/srv
-            - ${PWD}/media:/media/
-        restart: unless-stopped
-        depends_on:
-            - pxe-container
+#    pxe-samba:
+#        image: gists/samba-server
+#        container_name: samba-server
+#        ports:
+#            - "0.0.0.0:137:137/udp"
+#            - "0.0.0.0:138:138/udp"
+#            - "0.0.0.0:139:139/tcp"
+#            - "0.0.0.0:445:445/tcp"
+#        volumes:
+#            - ${PWD}/samba:/etc/samba
+#            - ${PWD}/srv:/srv
+#            - ${PWD}/media:/media/
+#        restart: unless-stopped
+#        depends_on:
+#            - pxe-container
diff --git a/dockerfile b/dockerfile
index a575d3e..b3a36d6 100755
--- a/dockerfile
+++ b/dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:latest
 
-RUN apt-get update && apt upgrade -y && apt-get autoremove -y
-RUN apt-get install unzip util-linux nano xz-utils wget systemctl sudo git tcpdump -y
+RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y
+RUN apt-get install unzip fdisk util-linux nano xz-utils wget systemctl sudo git tcpdump -y
 
 ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
diff --git a/start.sh b/start.sh
index 7a1237b..82e0520 100644
--- a/start.sh
+++ b/start.sh
@@ -45,6 +45,7 @@ menue()
 			mkdir samba srv
 			git clone https://github.com/beta-tester/RPi-PXE-Server.git
 			cp scripts/* RPi-PXE-Server
+			docker-compose build --no-cache
 			docker-compose up -d
 			docker exec -it pxe-container bash first_run.sh
 			clear 
@@ -105,6 +106,15 @@ menue()
 			;;
 			#############################################
 
+		p)	clear
+			docker exec -it pxe-container bash tails-patch.sh
+			clear
+			echo "Patch for Tails installed"
+			echo ""
+			menue
+			;;
+			#############################################
+
 		D)	clear
 			docker-compose down
 			docker rmi  pxe-image:latest