diff --git a/.drone.jsonnet b/.drone.jsonnet index 222b066..17cd8f9 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -15,12 +15,31 @@ 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 }, }, }; [ + { + 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', @@ -47,4 +66,4 @@ local build(dir, package) = { for app in apps ], }, -] \ No newline at end of file +] diff --git a/_CI-CD/debian-stable/Dockerfile b/_CI-CD/debian-stable/Dockerfile index 481934f..300fb57 100644 --- a/_CI-CD/debian-stable/Dockerfile +++ b/_CI-CD/debian-stable/Dockerfile @@ -4,12 +4,12 @@ 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 + man-db- \ + dnsutils 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/* ADD docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/docker-entrypoint.sh"] 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 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 && \