diff --git a/apps/apt-cacher-ng/live-deployment.yaml b/apps/apt-cacher-ng/live-deployment.yaml index ea5167a..5f6441e 100644 --- a/apps/apt-cacher-ng/live-deployment.yaml +++ b/apps/apt-cacher-ng/live-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: apt-cacher-ng - image: docker-registry.lan/apt-cacher-ng:latest + image: cr.lan/apt-cacher-ng:arm64 ports: - containerPort: 3142 protocol: TCP diff --git a/apps/curl/tekton-image-build.yaml b/apps/curl/tekton-image-build.yaml new file mode 100644 index 0000000..09f5229 --- /dev/null +++ b/apps/curl/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-curl +spec: + type: image + params: + - name: url + value: cr.lan/curl +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: build-curl +spec: + params: + - name: pathToDockerFile + type: string + default: $(resources.inputs.source.path)/apps/curl/Dockerfile + - name: pathToContext + type: string + default: $(resources.inputs.source.path)/apps/curl + 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-curl-taskrun +spec: + #serviceAccountName: dockerhub-service + taskRef: + name: build-curl + params: + - name: pathToDockerFile + value: Dockerfile + resources: + inputs: + - name: source + resourceRef: + name: chaos-kubernetes-git + outputs: + - name: builtImage + resourceRef: + name: img-curl + + \ No newline at end of file diff --git a/apps/distcc/Containerfile b/apps/distcc/Dockerfile similarity index 100% rename from apps/distcc/Containerfile rename to apps/distcc/Dockerfile diff --git a/apps/docker-registry/certs/docker-registry.lan b/apps/docker-registry/certs/docker-registry.lan deleted file mode 100644 index 45c4d05..0000000 --- a/apps/docker-registry/certs/docker-registry.lan +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -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 -i+DOL/C63wFKJddUnKSXCf+iAJraGw== ------END PRIVATE KEY----- diff --git a/apps/docker-registry/certs/docker-registry.lan.crt b/apps/docker-registry/certs/docker-registry.lan.crt deleted file mode 100644 index 642b1e3..0000000 --- a/apps/docker-registry/certs/docker-registry.lan.crt +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -Lpilp6oWJLkzjfyGR3Um ------END CERTIFICATE----- diff --git a/apps/mariadb/mariadb-deployment.yaml b/apps/mariadb/mariadb-deployment.yaml index 2e7b079..c95060d 100644 --- a/apps/mariadb/mariadb-deployment.yaml +++ b/apps/mariadb/mariadb-deployment.yaml @@ -29,7 +29,7 @@ spec: app: mariadb spec: containers: - - image: docker-registry.lan/mariadb:arm64 + - image: cr.lan/mariadb name: mariadb imagePullPolicy: Always env: @@ -49,7 +49,7 @@ spec: limits: memory: "1500Mi" cpu: "2000m" - - image: docker-registry.lan/mariadb-prometheus-exporter:arm64 + - image: cr.lan/mariadb-prometheus-exporter name: mariadb-prometheus-exporter imagePullPolicy: Always ports: diff --git a/apps/mariadb/docker-mariadb-prometheus/Containerfile b/apps/mariadb/mariadb-prometheus/Dockerfile similarity index 100% rename from apps/mariadb/docker-mariadb-prometheus/Containerfile rename to apps/mariadb/mariadb-prometheus/Dockerfile diff --git a/apps/mariadb/docker-mariadb/Containerfile b/apps/mariadb/mariadb/Dockerfile similarity index 100% rename from apps/mariadb/docker-mariadb/Containerfile rename to apps/mariadb/mariadb/Dockerfile diff --git a/apps/mariadb/docker-mariadb/docker-entrypoint.sh b/apps/mariadb/mariadb/docker-entrypoint.sh similarity index 100% rename from apps/mariadb/docker-mariadb/docker-entrypoint.sh rename to apps/mariadb/mariadb/docker-entrypoint.sh diff --git a/apps/mariadb/tekton-image-build-mariadb-prometheus-exporter.yaml b/apps/mariadb/tekton-image-build-mariadb-prometheus-exporter.yaml new file mode 100644 index 0000000..85753ac --- /dev/null +++ b/apps/mariadb/tekton-image-build-mariadb-prometheus-exporter.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-mariadb-prometheus-exporter +spec: + type: image + params: + - name: url + value: cr.lan/mariadb-prometheus-exporter +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: build-mariadb-prometheus-exporter +spec: + params: + - name: pathToDockerFile + type: string + default: $(resources.inputs.source.path)/apps/mariadb/mariadb-prometheus-exporter/Dockerfile + - name: pathToContext + type: string + default: $(resources.inputs.source.path)/apps/mariadb/mariadb + 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-mariadb-taskrun +spec: + #serviceAccountName: dockerhub-service + taskRef: + name: build-mariadb + params: + - name: pathToDockerFile + value: Dockerfile + resources: + inputs: + - name: source + resourceRef: + name: chaos-kubernetes-git + outputs: + - name: builtImage + resourceRef: + name: img-mariadb + + \ No newline at end of file diff --git a/apps/mariadb/tekton-image-build-mariadb.yaml b/apps/mariadb/tekton-image-build-mariadb.yaml new file mode 100644 index 0000000..2eacd82 --- /dev/null +++ b/apps/mariadb/tekton-image-build-mariadb.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-mariadb +spec: + type: image + params: + - name: url + value: cr.lan/mariadb +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: build-mariadb +spec: + params: + - name: pathToDockerFile + type: string + default: $(resources.inputs.source.path)/apps/mariadb/mariadb/Dockerfile + - name: pathToContext + type: string + default: $(resources.inputs.source.path)/apps/mariadb/mariadb + 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-mariadb-taskrun +spec: + #serviceAccountName: dockerhub-service + taskRef: + name: build-mariadb + params: + - name: pathToDockerFile + value: Dockerfile + resources: + inputs: + - name: source + resourceRef: + name: chaos-kubernetes-git + outputs: + - name: builtImage + resourceRef: + name: img-mariadb + + \ No newline at end of file