From 13898378cd8703b678b4a56bbbe1a6725c2c8008 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Fri, 15 Dec 2023 18:51:23 +0100
Subject: [PATCH] apps (some of them)

---
 .drone.jsonnet                       | 12 +++++++++---
 _CI-CD/distcc/Dockerfile             |  2 --
 apps/apt-cacher-ng/Dockerfile        |  2 +-
 apps/curl/Dockerfile                 |  2 +-
 apps/mosquitto/Dockerfile            |  2 +-
 apps/mosquitto/prometheus/Dockerfile |  4 ++--
 apps/mosquitto/tekton.yaml           | 23 -----------------------
 7 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 apps/mosquitto/tekton.yaml

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 8800f70..d21f07c 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,6 +1,6 @@
-local dirs = ['_CI-CD'];
+local dirs = ['_CI-CD', 'apps'];
 local packages = ['debian-stable','debian-testing','debian-stable-build-essential','debian-golang','debian-stable-php-fpm','distcc'];
-
+local apps = ['apt-cacher-ng', 'curl', 'mosquitto']
 local build(dir, package) = {
     kind: 'pipeline',
     type: 'docker',
@@ -26,5 +26,11 @@ local build(dir, package) = {
 std.flattenArrays([ [
       build('_CI-CD', pkg)
         for pkg in packages
-] ])
+      
+      ] + [
+      build('apps', app)
+        for app in apps
+      ]
+
+])
 
diff --git a/_CI-CD/distcc/Dockerfile b/_CI-CD/distcc/Dockerfile
index e7e680d..b06a3ab 100644
--- a/_CI-CD/distcc/Dockerfile
+++ b/_CI-CD/distcc/Dockerfile
@@ -6,8 +6,6 @@ RUN apt-get update && \
     dpkg-dev distcc ccache \
     build-essential gcc cpp g++ clang llvm 
 	
-	
-	
 RUN	apt-get remove -y --purge man-db ;\
 	apt-get autoremove -y --purge ;\ 
 	apt-get clean -y ;\ 
diff --git a/apps/apt-cacher-ng/Dockerfile b/apps/apt-cacher-ng/Dockerfile
index b089156..da503cc 100644
--- a/apps/apt-cacher-ng/Dockerfile
+++ b/apps/apt-cacher-ng/Dockerfile
@@ -1,4 +1,4 @@
-FROM cr.lan/debian-stable
+FROM cr.wks/debian-stable
 
 RUN apt-get update && apt-get install -y \
 	apt-cacher-ng && \
diff --git a/apps/curl/Dockerfile b/apps/curl/Dockerfile
index e437ed8..0cc41e1 100644
--- a/apps/curl/Dockerfile
+++ b/apps/curl/Dockerfile
@@ -1,4 +1,4 @@
-FROM cr.lan/debian-stable
+FROM cr.wks/debian-stable
 
 RUN apt-get update && apt-get install -y \
 	curl procps && \
diff --git a/apps/mosquitto/Dockerfile b/apps/mosquitto/Dockerfile
index ecf8ced..d164dbb 100644
--- a/apps/mosquitto/Dockerfile
+++ b/apps/mosquitto/Dockerfile
@@ -1,4 +1,4 @@
-FROM cr.lan/debian-stable
+FROM cr.wks/debian-stable
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/apps/mosquitto/prometheus/Dockerfile b/apps/mosquitto/prometheus/Dockerfile
index aed1275..8fa0c99 100644
--- a/apps/mosquitto/prometheus/Dockerfile
+++ b/apps/mosquitto/prometheus/Dockerfile
@@ -1,4 +1,4 @@
-FROM cr.lan/debian-golang-stable
+FROM cr.wks/debian-golang-stable
 
 ENV GOARCH=arm64
 ENV GOPATH=/usr/src/gopath
@@ -6,5 +6,5 @@ ENV GOCACHE=/usr/src/gocache
 RUN go env
 WORKDIR /usr/src
 RUN go get github.com/sapcc/mosquitto-exporter
-RUN make j4 build CGO_ENABLED=0
+RUN make -j4 build CGO_ENABLED=0
 RUN ls -al
\ No newline at end of file
diff --git a/apps/mosquitto/tekton.yaml b/apps/mosquitto/tekton.yaml
deleted file mode 100644
index 185a277..0000000
--- a/apps/mosquitto/tekton.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-mosquitto
-spec:
-  pipelineRef:
-    name: kaniko-pipeline
-  params:
-    - name: git-url
-      value: http://git-ui.lan/chaos/kubernetes.git
-    - name: git-revision
-      value: master
-    - name: path-to-image-context
-      value: apps/mosquitto
-    - name: path-to-dockerfile
-      value: apps/mosquitto/Dockerfile
-    - name: image-name
-      value: cr.lan/mosquitto
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/mosquitto
\ No newline at end of file