context for drone and cleanup/update

2023-12-15 18:04:23 +01:00
parent 3debf1dabc
commit 86855f541a
12 changed files with 9 additions and 146 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -12,7 +12,8 @@ local build(dir, package) = {
    steps: [ {
    name: '%(package)s' % { package: package },
    image: 'plugins/docker',
-    settings: {
+    settings: { 
+        context: '%(dir)s/%(package)s' % { dir: dir, package: package },
        dockerfile: '%(dir)s/%(package)s/Dockerfile' % { dir: dir, package: package },
        registry: 'http://cr.wks',
        insecure: 'true',
--- a/_CI-CD/debian-golang/Dockerfile
+++ b/_CI-CD/debian-golang/Dockerfile
@@ -1,4 +1,4 @@
-FROM cr.lan/debian-stable
+FROM cr.wks/debian-stable

 RUN apt-get update && apt-get install -y \
 	golang make git
--- a/_CI-CD/debian-golang/tekton.yaml
+++ b/_CI-CD/debian-golang/tekton.yaml
@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-debian-golang
-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: _CI-CD/debian-golang
-    - name: path-to-dockerfile
-      value: _CI-CD/debian-golang/Dockerfile
-    - name: image-name
-      value: cr.lan/debian-stable-golang
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/debian-stable-golang
--- a/_CI-CD/debian-stable-build-essential/tekton.yaml
+++ b/_CI-CD/debian-stable-build-essential/tekton.yaml
@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-debian-stable-build-essential
-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: _CI-CD/debian-stable-build-essential
-    - name: path-to-dockerfile
-      value: _CI-CD/debian-stable-build-essential/Dockerfile
-    - name: image-name
-      value: cr.lan/debian-stable-build-essential
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/debian-stable-build-essential
--- a/_CI-CD/debian-stable-php-fpm/Dockerfile
+++ b/_CI-CD/debian-stable-php-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM cr.lan/debian-stable
+FROM cr.wks/debian-stable

 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y \
--- a/_CI-CD/debian-stable-php-fpm/tekton.yaml
+++ b/_CI-CD/debian-stable-php-fpm/tekton.yaml
@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-debian-stable-php-fpm
-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: _CI-CD/debian-stable-php-fpm
-    - name: path-to-dockerfile
-      value: _CI-CD/debian-stable-php-fpm/Dockerfile
-    - name: image-name
-      value: cr.lan/debian-stable-php-fpm
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/debian-stable-php-fpm
--- a/_CI-CD/debian-stable/Dockerfile
+++ b/_CI-CD/debian-stable/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:stable-slim

-RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \
-	sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \
+RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/sources.list && \
+	sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list && \
 	apt-get update && apt-get install -y \
 	dnsutils procps nmap bash iputils-ping bash && \

--- a/_CI-CD/debian-stable/tekton.yaml
+++ b/_CI-CD/debian-stable/tekton.yaml
@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-debian-stable
-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: _CI-CD/debian-stable
-    - name: path-to-dockerfile
-      value: _CI-CD/debian-stable/Dockerfile
-    - name: image-name
-      value: cr.lan/debian-stable
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/debian-stable
--- a/_CI-CD/debian-testing/Dockerfile
+++ b/_CI-CD/debian-testing/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:testing-slim

-RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \
-	sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \
+RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/sources.list && \
+	sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list && \
 	apt-get update && apt-get install -y \
 	dnsutils procps nmap bash iputils-ping bash

--- a/_CI-CD/debian-testing/tekton.yaml
+++ b/_CI-CD/debian-testing/tekton.yaml
@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-debian-testing
-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: _CI-CD/debian-testing
-    - name: path-to-dockerfile
-      value: _CI-CD/debian-testing/Dockerfile
-    - name: image-name
-      value: cr.lan/debian-testing
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/debian-testing
--- a/_CI-CD/distcc/Dockerfile
+++ b/_CI-CD/distcc/Dockerfile
@@ -1,4 +1,4 @@
-FROM cr.lan/debian-stable-build-essential
+FROM cr.wks/debian-stable-build-essential

 RUN apt-get update && \
  	apt-get install -y \
--- a/_CI-CD/distcc/tekton.yaml
+++ b/_CI-CD/distcc/tekton.yaml
@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-distcc
-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: _CI-CD/distcc
-    - name: path-to-dockerfile
-      value: _CI-CD/distcc/Dockerfile
-    - name: image-name
-      value: cr.lan/distcc
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/distcc