From 1a42071c2653bd1ccd0a70b130c4f4b55e6fbe21 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Thu, 18 Feb 2021 21:49:53 +0100 Subject: [PATCH] mosquitto in tekton --- apps/mosquitto/{Containerfile => Dockerfile} | 9 ++- apps/mosquitto/deployment.yaml | 4 +- apps/mosquitto/tekton-image-build.yaml | 76 ++++++++++++++++++++ 3 files changed, 82 insertions(+), 7 deletions(-) rename apps/mosquitto/{Containerfile => Dockerfile} (58%) create mode 100644 apps/mosquitto/tekton-image-build.yaml diff --git a/apps/mosquitto/Containerfile b/apps/mosquitto/Dockerfile similarity index 58% rename from apps/mosquitto/Containerfile rename to apps/mosquitto/Dockerfile index 300e15b..85ddb73 100644 --- a/apps/mosquitto/Containerfile +++ b/apps/mosquitto/Dockerfile @@ -1,16 +1,15 @@ FROM debian:stable-slim -#RUN echo 'Acquire::http::proxy "http://172.23.255.1:3142";' >/etc/apt/apt.conf.d/proxy -RUN apt-get update && \ +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 --no-install-recommends \ - mosquitto mosquitto-clients procps && \ + mosquitto && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Op port EXPOSE 1883 -# Stats port -#EXPOSE 9090 ADD docker-entrypoint.sh / diff --git a/apps/mosquitto/deployment.yaml b/apps/mosquitto/deployment.yaml index 49a98db..2b35a17 100644 --- a/apps/mosquitto/deployment.yaml +++ b/apps/mosquitto/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: mqtt-mosquitto - image: docker-registry.lan/mosquitto:arm64 + image: cr.lan/mosquitto imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -63,7 +63,7 @@ spec: name: mosquitto-data subPath: mosquitto/data - name: mosquitto-exporter - image: docker-registry.lan/mosquitto-exporter:arm64 + image: cr.lan/mosquitto-exporter imagePullPolicy: Always ports: - containerPort: 9234 diff --git a/apps/mosquitto/tekton-image-build.yaml b/apps/mosquitto/tekton-image-build.yaml new file mode 100644 index 0000000..4c1d9da --- /dev/null +++ b/apps/mosquitto/tekton-image-build.yaml @@ -0,0 +1,76 @@ +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-mosquitto +spec: + type: image + params: + - name: url + value: cr.lan/mosquitto +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: build-mosquitto +spec: + params: + - name: pathToDockerFile + type: string + default: $(resources.inputs.source.path)/apps/mosquitto/Dockerfile + - name: pathToContext + type: string + default: $(resources.inputs.source.path)/apps/mosquitto + 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.pathToDockerFile) + - --destination=$(resources.outputs.builtImage.url) + - --context=$(params.pathToContext) + - --skip-tls-verify +--- +apiVersion: tekton.dev/v1beta1 +kind: TaskRun +metadata: + name: img-mosquitto-taskrun +spec: + #serviceAccountName: dockerhub-service + taskRef: + name: build-mosquitto + params: + - name: pathToDockerFile + value: Dockerfile + resources: + inputs: + - name: source + resourceRef: + name: chaos-kubernetes-git + outputs: + - name: builtImage + resourceRef: + name: img-mosquitto + + \ No newline at end of file