From fa3cd5ea7c430c16c103af077ad8839aadf992da Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 8 May 2021 11:59:12 +0200 Subject: [PATCH] debian testing image --- _CI-CD/debian-testing/Dockerfile | 11 +++ _CI-CD/debian-testing/docker-entrypoint.sh | 5 ++ .../debian-testing/tekton-debian-testing.yaml | 85 +++++++++++++++++++ apps/web/nextcloud/deployment.yaml | 3 +- 4 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 _CI-CD/debian-testing/Dockerfile create mode 100755 _CI-CD/debian-testing/docker-entrypoint.sh create mode 100644 _CI-CD/debian-testing/tekton-debian-testing.yaml diff --git a/_CI-CD/debian-testing/Dockerfile b/_CI-CD/debian-testing/Dockerfile new file mode 100644 index 0000000..4f3c8bf --- /dev/null +++ b/_CI-CD/debian-testing/Dockerfile @@ -0,0 +1,11 @@ +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 && \ + apt-get update && apt-get install -y \ + dnsutils procps nmap bash iputils-ping bash && \ + apt-get clean -y && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/cache/apt/* +ADD docker-entrypoint.sh / +ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file diff --git a/_CI-CD/debian-testing/docker-entrypoint.sh b/_CI-CD/debian-testing/docker-entrypoint.sh new file mode 100755 index 0000000..1eb0714 --- /dev/null +++ b/_CI-CD/debian-testing/docker-entrypoint.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +exec "$@" \ No newline at end of file diff --git a/_CI-CD/debian-testing/tekton-debian-testing.yaml b/_CI-CD/debian-testing/tekton-debian-testing.yaml new file mode 100644 index 0000000..be0cc5b --- /dev/null +++ b/_CI-CD/debian-testing/tekton-debian-testing.yaml @@ -0,0 +1,85 @@ +apiVersion: tekton.dev/v1alpha1 +kind: PipelineResource +metadata: + name: chaos-kubernetes-git +spec: + type: git + params: + - name: revision + value: master + - name: url + value: http://git-ui.lan/chaos/kubernetes.git + - name: submodules + value: "false" +--- +apiVersion: tekton.dev/v1alpha1 +kind: PipelineResource +metadata: + name: img-debian-testing +spec: + type: image + params: + - name: url + value: cr.lan/debian-testing +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: build-debian-testing +spec: + params: + - name: pathToContainerFile + type: string + default: $(resources.inputs.source.path)/_CI-CD/debian-testing/Dockerfile + - name: pathToContext + type: string + default: $(resources.inputs.source.path)/_CI-CD/debian-testing + resources: + inputs: + - name: source + type: git + outputs: + - name: builtImage + type: image + steps: + - name: build-and-push + image: gcr.io/kaniko-project/executor:arm64 + command: + - /kaniko/executor + args: + - --dockerfile=$(params.pathToContainerFile) + - --destination=$(resources.outputs.builtImage.url) + - --context=$(params.pathToContext) + - --snapshotMode=redo + - --skip-tls-verify + #workspaces: + # - name: workspace + # mountPath: /workspace +--- +apiVersion: tekton.dev/v1beta1 +kind: TaskRun +metadata: + name: img-debian-testing +spec: + taskRef: + name: build-debian-testing + params: + - name: pathToContainerFile + value: Dockerfile + resources: + inputs: + - name: source + resourceRef: + name: chaos-kubernetes-git + outputs: + - name: builtImage + resourceRef: + name: img-debian-testing +# workspaces: +# - name: workspace +# persistentVolumeClaim: +# claimName: tektoncd-workspaces +# subPath: workspaces + + + \ No newline at end of file diff --git a/apps/web/nextcloud/deployment.yaml b/apps/web/nextcloud/deployment.yaml index b51c7b9..970de9f 100644 --- a/apps/web/nextcloud/deployment.yaml +++ b/apps/web/nextcloud/deployment.yaml @@ -23,7 +23,8 @@ spec: spec: containers: - name: nextcloud - image: cr.lan/nextcloud + #image: cr.lan/nextcloud + image: docker.io/nextcloud:stable-apache #lifecycle: # postStart: # exec: