From 1d84d11f37ff52d7d18cc98097a976a147ad9934 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 8 Apr 2024 16:29:04 +0200 Subject: [PATCH 1/7] new ROMPR Version --- apps/rompr/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/rompr/Dockerfile b/apps/rompr/Dockerfile index c0ed477..0988006 100644 --- a/apps/rompr/Dockerfile +++ b/apps/rompr/Dockerfile @@ -1,6 +1,6 @@ FROM cr.wks/debian-stable-php-fpm -ARG ROMPR_VERSION=2.10 +ARG ROMPR_VERSION=2.14 # Install packages ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ From b451999d779cb6a89c9bdcda9d2d7158150db3d4 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 8 Apr 2024 16:53:49 +0200 Subject: [PATCH 2/7] dry_run and cache_from its own image --- .drone.jsonnet | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 222b066..a7b6d9e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -15,9 +15,12 @@ local build(dir, package) = { dockerfile: '%(dir)s/%(package)s/Dockerfile' % { dir: dir, package: package }, registry: 'http://cr.wks', insecure: 'true', + purge: 'false', experimental: 'true', tags: ['latest'], repo: 'cr.wks/%(package)s' % { package: package }, + cache_from: 'cr.wks/%(package)s:latest' % { package: package }, + dry_run: 'true' }, }; [ @@ -47,4 +50,4 @@ local build(dir, package) = { for app in apps ], }, -] \ No newline at end of file +] From dd5295560244a5fd14fcf5af5269ee8008237663 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 8 Apr 2024 18:02:10 +0200 Subject: [PATCH 3/7] one character less optimization --- apps/curl/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/curl/Dockerfile b/apps/curl/Dockerfile index 0cc41e1..7d58e08 100644 --- a/apps/curl/Dockerfile +++ b/apps/curl/Dockerfile @@ -1,5 +1,4 @@ FROM cr.wks/debian-stable - RUN apt-get update && apt-get install -y \ curl procps && \ apt-get clean -y && \ From 9d83926159ee2a7a15058131ce705575ea283b0d Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 8 Apr 2024 18:47:43 +0200 Subject: [PATCH 4/7] git in debian-stable image --- .drone.jsonnet | 1 - _CI-CD/debian-stable/Dockerfile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index a7b6d9e..4d32cd9 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -20,7 +20,6 @@ local build(dir, package) = { tags: ['latest'], repo: 'cr.wks/%(package)s' % { package: package }, cache_from: 'cr.wks/%(package)s:latest' % { package: package }, - dry_run: 'true' }, }; [ diff --git a/_CI-CD/debian-stable/Dockerfile b/_CI-CD/debian-stable/Dockerfile index 481934f..c94ef4f 100644 --- a/_CI-CD/debian-stable/Dockerfile +++ b/_CI-CD/debian-stable/Dockerfile @@ -4,7 +4,7 @@ RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/so sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list.d/debian.sources RUN apt-get update && apt-get install -y \ - dnsutils procps nmap bash iputils-ping bash + dnsutils procps nmap bash iputils-ping bash git RUN apt-get remove -y --purge man-db ;\ apt-get autoremove -y --purge ;\ @@ -12,4 +12,4 @@ RUN apt-get remove -y --purge man-db ;\ 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 +ENTRYPOINT ["/docker-entrypoint.sh"] From 5751f2c82ea88eb6bd5c12a64fb33b14feebf71f Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 8 Apr 2024 18:58:03 +0200 Subject: [PATCH 5/7] removing man-db in first run --- _CI-CD/debian-stable/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/_CI-CD/debian-stable/Dockerfile b/_CI-CD/debian-stable/Dockerfile index c94ef4f..df772ec 100644 --- a/_CI-CD/debian-stable/Dockerfile +++ b/_CI-CD/debian-stable/Dockerfile @@ -4,10 +4,9 @@ RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/so sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list.d/debian.sources RUN apt-get update && apt-get install -y \ - dnsutils procps nmap bash iputils-ping bash git + dnsutils man-db- procps nmap bash iputils-ping bash git -RUN apt-get remove -y --purge man-db ;\ - apt-get autoremove -y --purge ;\ +RUN apt-get autoremove -y --purge ;\ apt-get clean -y ;\ rm -rf /var/lib/apt/lists/* ;\ rm -rf /var/cache/apt/* From 0da2ea2477c5f4f9330e32389954e087c780c555 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 8 Apr 2024 19:27:09 +0200 Subject: [PATCH 6/7] removal clearer typed --- _CI-CD/debian-stable/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_CI-CD/debian-stable/Dockerfile b/_CI-CD/debian-stable/Dockerfile index df772ec..300fb57 100644 --- a/_CI-CD/debian-stable/Dockerfile +++ b/_CI-CD/debian-stable/Dockerfile @@ -4,7 +4,8 @@ RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/so sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list.d/debian.sources RUN apt-get update && apt-get install -y \ - dnsutils man-db- procps nmap bash iputils-ping bash git + man-db- \ + dnsutils procps nmap bash iputils-ping bash git RUN apt-get autoremove -y --purge ;\ apt-get clean -y ;\ From 0b93d83014d63491a544dcc59d634c9b938abfaf Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 15 Apr 2024 17:42:09 +0200 Subject: [PATCH 7/7] git log step --- .drone.jsonnet | 17 +++++++++++++++++ apps/apt-cacher-ng/Dockerfile | 2 +- apps/apt-cacher-ng/tekton.yaml | 23 ----------------------- 3 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 apps/apt-cacher-ng/tekton.yaml diff --git a/.drone.jsonnet b/.drone.jsonnet index 4d32cd9..17cd8f9 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -23,6 +23,23 @@ local build(dir, package) = { }, }; [ + { + kind: 'pipeline', + type: 'docker', + name: 'git log', + platform: { + os: 'linux', + arch: 'arm64', + }, + steps: [ + { + name: 'git log', + image: 'cr.wks/debian-stable', + commands: [ 'git diff-tree --no-commit-id --name-only HEAD -r' ] + } + ], + }, + { kind: 'pipeline', type: 'docker', diff --git a/apps/apt-cacher-ng/Dockerfile b/apps/apt-cacher-ng/Dockerfile index da503cc..2be5168 100644 --- a/apps/apt-cacher-ng/Dockerfile +++ b/apps/apt-cacher-ng/Dockerfile @@ -8,5 +8,5 @@ RUN apt-get update && apt-get install -y \ RUN echo 'PassThroughPattern: .*' >> /etc/apt-cacher-ng/acng.conf -EXPOSE 3142 +EXPOSE 3142 CMD /usr/sbin/apt-cacher-ng -c /etc/apt-cacher-ng pidfile=/var/run/apt-cacher-ng/pid SocketPath=/var/run/apt-cacher-ng/socket foreground=1 diff --git a/apps/apt-cacher-ng/tekton.yaml b/apps/apt-cacher-ng/tekton.yaml deleted file mode 100644 index 4de7a7f..0000000 --- a/apps/apt-cacher-ng/tekton.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: tekton.dev/v1beta1 -kind: PipelineRun -metadata: - name: img-apt-cacher-ng -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/apt-cacher-ng - - name: path-to-dockerfile - value: apps/apt-cacher-ng/Dockerfile - - name: image-name - value: cr.lan/apt-cacher-ng - workspaces: - - name: git-source - persistentVolumeClaim: - claimName: tektoncd-workspaces - subPath: tekton/apt-cacher-ng