Compare commits

..

3 Commits
3.16 ... 3.11

Author SHA1 Message Date
chris 96a3db5b1f 3.11.7
dockers/alpine/pipeline/head There was a failure building this commit Details
2020-12-18 01:26:00 +01:00
chris edc938ad1e Merge branch '3.12' into 3.11 2020-12-18 01:25:22 +01:00
chris 7323600ec1 3.11.7
dockers/alpine/pipeline/head There was a failure building this commit Details
2020-12-18 00:25:54 +01:00
5 changed files with 14 additions and 22 deletions

View File

@ -1,29 +1,24 @@
FROM alpine as build
ARG VERSION
ENV ALPINE_SERIES 3.16
ENV ALPINE_SERIES 3.11
ENV ALPINE_MIRROR https://ftp.halifax.rwth-aachen.de/alpine/v${ALPINE_SERIES}
ENV ALPINE_ARCH x86_64
WORKDIR /root
RUN set -xo pipefail; apk add --no-cache curl gnupg &&\
curl -LO ${ALPINE_MIRROR}/releases/${ALPINE_ARCH}/alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz &&\
#curl -LO ${ALPINE_MIRROR}/releases/${ALPINE_ARCH}/alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz.asc &&\
#gpg --keyserver pool.sks-keyservers.net --recv 0482D84022F52DF1C4E7CD43293ACD0907D9495A &&\
#gpg --verify alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz.asc alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz &&\
curl -LO ${ALPINE_MIRROR}/releases/${ALPINE_ARCH}/alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz.asc &&\
gpg --keyserver pool.sks-keyservers.net --recv 0482D84022F52DF1C4E7CD43293ACD0907D9495A &&\
gpg --verify alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz.asc alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz &&\
mkdir /dest &&\
tar -C /dest -xvzf alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz &&\
sed -i "s#http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_SERIES}#${ALPINE_MIRROR}#g" /dest/etc/apk/repositories
ADD scan-deps.sh /bin/scan-deps
FROM scratch
ARG VERSION
ARG DATE
COPY --from=build /dest /
RUN set -xe;\
apk add --no-cache ca-certificates curl &&\
apk upgrade -a &&\
rm -rf /var/cache/apk/*
RUN apk add --no-cache ca-certificates curl
CMD ["/bin/sh"]
LABEL version.alpine=$VERSION build.date=$DATE

12
Jenkinsfile vendored
View File

@ -1,4 +1,4 @@
version = "3.16.3"
version = "3.11.7"
project = "alpine"
repo = "zknt"
registry = "reg.zknt.org"
@ -14,14 +14,14 @@ pipeline {
script {
def customImage = docker.build(registry+'/'+repo+'/'+project, "--pull --build-arg VERSION=$version --build-arg DATE=$timeStamp .")
customImage.push(version)
customImage.push("3.16")
customImage.push("3.11")
def io_registry_credentials = "3deeee3d-6fce-4430-98dd-9b4db56f43f7"
withDockerRegistry([ credentialsId: io_registry_credentials ]) {
def io_registry_image = repo + '/' + project + ':' + version
sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image
sh "docker push " + io_registry_image
sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":3.16"
sh "docker push " + io_registry_image.split(/\:/)[0] + ":3.16"
sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":3.11"
sh "docker push " + io_registry_image.split(/\:/)[0] + ":3.11"
}
def quay_credentials= "18fb6f7e-c6bc-4d06-9bf9-08c2af6bfc1a"
@ -29,8 +29,8 @@ pipeline {
def quay_image = 'quay.io/' + repo + '/' + project + ':' + version
sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image
sh "docker push " + quay_image
sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":3.16"
sh "docker push " + quay_image.split(/\:/)[0] + ":3.16"
sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":3.11"
sh "docker push " + quay_image.split(/\:/)[0] + ":3.11"
}
}
}

View File

@ -3,7 +3,7 @@ stock alpine
Basic Alpine base image, pulling Alpines minirootfs and extracting to `scratch`.
Builds both `edge` and latest release (currently `3.14`) in branches.
Builds both `edge` and latest release (currently `3.12`) in branches.
Source repository: https://git.zknt.org/dockers/alpine

View File

@ -1,5 +1,4 @@
---
version: 3.16.3
version: 3.11.7
project: alpine
additional_tags:
- 3.16
- 3.11

View File

@ -1,2 +0,0 @@
#!/bin/sh
scanelf --needed --nobanner --format '%n#p' --recursive $@ | tr ',' '\n' | sort -u | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }'