From 3bb2b5072a813dd2683e46e6c2c2a2e16cff7f55 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sat, 31 Oct 2020 23:45:24 +0100
Subject: [PATCH] webapps

---
 apps/grav/Dockerfile                      | 27 +++++++++++++++
 apps/{urubu => grav}/docker-entrypoint.sh |  0
 apps/{urubu => grav}/urubu.yaml           |  0
 apps/nginx-test-deployment.yaml           | 42 +++++++++++++++++++++++
 apps/urubu/Dockerfile                     | 22 ------------
 5 files changed, 69 insertions(+), 22 deletions(-)
 create mode 100644 apps/grav/Dockerfile
 rename apps/{urubu => grav}/docker-entrypoint.sh (100%)
 rename apps/{urubu => grav}/urubu.yaml (100%)
 create mode 100644 apps/nginx-test-deployment.yaml
 delete mode 100644 apps/urubu/Dockerfile

diff --git a/apps/grav/Dockerfile b/apps/grav/Dockerfile
new file mode 100644
index 0000000..933988a
--- /dev/null
+++ b/apps/grav/Dockerfile
@@ -0,0 +1,27 @@
+FROM php:7-fpm
+
+RUN echo 'Acquire::http::proxy "http://apt-cache.lan";' >/etc/apt/apt.conf.d/proxy
+
+ARG DEV_PKGS='zlib1g-dev libpng-dev libjpeg-dev libfreetype6-dev \
+	libcurl4-gnutls-dev default-libmysqlclient-dev'
+	
+RUN apt-get update && \
+	apt-get install -y imagemagick git bash procps \
+	${DEV_PKGS} && \
+	docker-php-ext-configure gd --with-freetype --with-jpeg && \
+    docker-php-ext-install -j$(nproc) gd && \
+    docker-php-ext-install -j$(nproc) json && \ 
+    docker-php-ext-install -j$(nproc) curl
+
+# CLeanup	
+RUN	apt-get remove -y --purge ${DEV_PKGS} && \
+	apt-get autoremove --purge -y && \
+	apt-get clean -y && \ 
+	rm -rf /var/lib/apt/lists/* && \
+	rm -rf /var/cache/apt/* /tmp/* /var/tmp/* /var/log/*
+	
+ADD docker-entrypoint.sh /
+
+ENTRYPOINT ["/docker-entrypoint.sh"]	
+
+VOLUME [ "/data" ]
diff --git a/apps/urubu/docker-entrypoint.sh b/apps/grav/docker-entrypoint.sh
similarity index 100%
rename from apps/urubu/docker-entrypoint.sh
rename to apps/grav/docker-entrypoint.sh
diff --git a/apps/urubu/urubu.yaml b/apps/grav/urubu.yaml
similarity index 100%
rename from apps/urubu/urubu.yaml
rename to apps/grav/urubu.yaml
diff --git a/apps/nginx-test-deployment.yaml b/apps/nginx-test-deployment.yaml
new file mode 100644
index 0000000..f686552
--- /dev/null
+++ b/apps/nginx-test-deployment.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      run: nginx-deployment
+  template:
+    metadata:
+      labels:
+        run: nginx-deployment
+    spec:
+      containers:
+      - image: nginx
+        name: nginx-webserver
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nginx-service
+spec:
+  type: NodePort
+  selector:
+    run: nginx-deployment
+  ports:
+    - port: 80
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: nginx-test
+spec:
+  rules:
+  - host: nginx-test.lan
+    http:
+      paths:
+      - backend:
+          serviceName: nginx-service
+          servicePort: 80
\ No newline at end of file
diff --git a/apps/urubu/Dockerfile b/apps/urubu/Dockerfile
deleted file mode 100644
index f6f8239..0000000
--- a/apps/urubu/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM debian:buster-slim
-
-RUN apt-get update -y && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip bash
-
-# Ze APP
-RUN pip3 install urubu
-
-# CLeanup	
-RUN	DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y && \
-	DEBIAN_FRONTEND=noninteractive apt-get clean -y && \ 
-	rm -rf /var/lib/apt/lists/* && \
-	rm -rf /var/cache/apt/* /tmp/* /var/tmp/* /var/log/*
-
-
-ADD docker-entrypoint.sh /
-
-ENTRYPOINT ["/docker-entrypoint.sh"]	
-
-VOLUME [ "/data" ]
-EXPOSE 8000
-CMD ["make", "serve"]