Merge branch 'main' of ssh://gitea.service.nr5:2222/chaos/docker-images

This commit is contained in:
2024-04-21 11:36:08 +02:00
5 changed files with 25 additions and 30 deletions

View File

@@ -15,12 +15,31 @@ local build(dir, package) = {
dockerfile: '%(dir)s/%(package)s/Dockerfile' % { dir: dir, package: package }, dockerfile: '%(dir)s/%(package)s/Dockerfile' % { dir: dir, package: package },
registry: 'http://cr.wks', registry: 'http://cr.wks',
insecure: 'true', insecure: 'true',
purge: 'false',
experimental: 'true', experimental: 'true',
tags: ['latest'], tags: ['latest'],
repo: 'cr.wks/%(package)s' % { package: package }, 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', kind: 'pipeline',
type: 'docker', type: 'docker',
@@ -47,4 +66,4 @@ local build(dir, package) = {
for app in apps for app in apps
], ],
}, },
] ]

View File

@@ -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 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 \ 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 ;\ RUN apt-get autoremove -y --purge ;\
apt-get autoremove -y --purge ;\
apt-get clean -y ;\ apt-get clean -y ;\
rm -rf /var/lib/apt/lists/* ;\ rm -rf /var/lib/apt/lists/* ;\
rm -rf /var/cache/apt/* rm -rf /var/cache/apt/*
ADD docker-entrypoint.sh / ADD docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

View File

@@ -8,5 +8,5 @@ RUN apt-get update && apt-get install -y \
RUN echo 'PassThroughPattern: .*' >> /etc/apt-cacher-ng/acng.conf 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 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

View File

@@ -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

View File

@@ -1,5 +1,4 @@
FROM cr.wks/debian-stable FROM cr.wks/debian-stable
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
curl procps && \ curl procps && \
apt-get clean -y && \ apt-get clean -y && \