apt-cacher image doesn't use apt-cache.lan... yes,yes!

This commit is contained in:
2021-02-19 21:35:26 +01:00
parent 9cda7c9f76
commit ed3e8cdddc
3 changed files with 8 additions and 18 deletions

View File

@@ -1,8 +1,6 @@
FROM debian:stable-slim
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 \
RUN apt-get update && apt-get install -y \
apt-cacher-ng && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/* && \
@@ -14,5 +12,4 @@ CMD chown apt-cacher-ng:apt-cacher-ng /var/cache/apt-cacher-ng
EXPOSE 3142
USER apt-cacher-ng
#CMD chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*
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

@@ -55,7 +55,7 @@ spec:
apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
name: img-distcc-taskrun
name: img-distcc
spec:
#serviceAccountName: dockerhub-service
taskRef:

View File

@@ -45,19 +45,12 @@ spec:
script: |
#!/usr/bin/env bash
cd $(resources.inputs.source.path)
pwd
ls -la
GO_PATH=/usr/src/gopath
PKG_NAME=github.com/sapcc/mosquitto-exporter
BUILD_DIR=bin
MOSQUITTO_EXPORTER_BINARY=${BUILD_DIR}/mosquitto_exporter
IMAGE=apcc/mosquitto-exporter
VERSION=0.6.0
LDFLAGS="-s -w -X main.Version=${VERSION} -X main.GITCOMMIT=$(git rev-parse --short HEAD)"
CGO_ENABLED=0
GOOS=linux
mkdir -p ${BUILD_DIR} ${GO_PATH}
go build -o ${MOSQUITTO_EXPORTER_BINARY} -ldflags="${LDFLAGS}" ${PKG_NAME}
export GOARCH=arm64
export GOPATH=/usr/src/gopath
export GOCACHE=/usr/src/gocache
go env
go get
make -j4 build CGO_ENABLED=1
- name: build-and-push
image: gcr.io/kaniko-project/executor:arm64
command: