meatbag/baseimage-alpine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bump to alpine 3.10 and s6 v1.22.1.0

Browse source
This commit is contained in:
thelamer 2019-06-28 14:12:42 -07:00
parent 33143c1a8e
commit e12acbf292
5 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -1,8 +1,8 @@
FROM alpine:3.9 as rootfs-stage FROM alpine:3.10 as rootfs-stage
MAINTAINER sparkyballs,thelamer MAINTAINER sparkyballs,thelamer
# environment # environment
ENV REL=v3.9 ENV REL=v3.10
ENV ARCH=x86_64 ENV ARCH=x86_64
ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine
ENV PACKAGES=alpine-baselayout,\ ENV PACKAGES=alpine-baselayout,\
@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL MAINTAINER="sparkyballs,TheLamer" LABEL MAINTAINER="sparkyballs,TheLamer"
# set version for s6 overlay # set version for s6 overlay
ARG OVERLAY_VERSION="v1.22.0.0" ARG OVERLAY_VERSION="v1.22.1.0"
ARG OVERLAY_ARCH="amd64" ARG OVERLAY_ARCH="amd64"
# environment variables # environment variables

6
Dockerfile.aarch64
View file

@ -1,8 +1,8 @@
FROM alpine:3.9 as rootfs-stage FROM alpine:3.10 as rootfs-stage
MAINTAINER sparkyballs,thelamer MAINTAINER sparkyballs,thelamer
# environment # environment
ENV REL=v3.9 ENV REL=v3.10
ENV ARCH=aarch64 ENV ARCH=aarch64
ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine
ENV PACKAGES=alpine-baselayout,\ ENV PACKAGES=alpine-baselayout,\
@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL MAINTAINER="sparkyballs,TheLamer" LABEL MAINTAINER="sparkyballs,TheLamer"
# set version for s6 overlay # set version for s6 overlay
ARG OVERLAY_VERSION="v1.22.0.0" ARG OVERLAY_VERSION="v1.22.1.0"
ARG OVERLAY_ARCH="aarch64" ARG OVERLAY_ARCH="aarch64"
# environment variables # environment variables

6
Dockerfile.armhf
View file

@ -1,8 +1,8 @@
FROM alpine:3.9 as rootfs-stage FROM alpine:3.10 as rootfs-stage
MAINTAINER sparkyballs,thelamer MAINTAINER sparkyballs,thelamer
# environment # environment
ENV REL=v3.9 ENV REL=v3.10
ENV ARCH=armv7 ENV ARCH=armv7
ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine
ENV PACKAGES=alpine-baselayout,\ ENV PACKAGES=alpine-baselayout,\
@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL MAINTAINER="sparkyballs,TheLamer" LABEL MAINTAINER="sparkyballs,TheLamer"
# set version for s6 overlay # set version for s6 overlay
ARG OVERLAY_VERSION="v1.22.0.0" ARG OVERLAY_VERSION="v1.22.1.0"
ARG OVERLAY_ARCH="arm" ARG OVERLAY_ARCH="arm"
# environment variables # environment variables

30
Jenkinsfile vendored
View file

@ -35,7 +35,7 @@ pipeline {
script{ script{
env.EXIT_STATUS = '' env.EXIT_STATUS = ''
env.LS_RELEASE = sh( env.LS_RELEASE = sh(
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.9 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.1 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
returnStdout: true).trim() returnStdout: true).trim()
env.LS_RELEASE_NOTES = sh( env.LS_RELEASE_NOTES = sh(
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@ -507,12 +507,12 @@ pipeline {
sh '''#! /bin/bash sh '''#! /bin/bash
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
''' '''
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:3.9" sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:3.1"
sh "docker push ${IMAGE}:3.9" sh "docker push ${IMAGE}:3.1"
sh "docker push ${IMAGE}:${META_TAG}" sh "docker push ${IMAGE}:${META_TAG}"
sh '''docker rmi \ sh '''docker rmi \
${IMAGE}:${META_TAG} \ ${IMAGE}:${META_TAG} \
${IMAGE}:3.9 || :''' ${IMAGE}:3.1 || :'''
} }
} }
@ -542,24 +542,24 @@ pipeline {
docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
fi''' fi'''
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-3.9" sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-3.1"
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-3.9" sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-3.1"
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-3.9" sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-3.1"
sh "docker push ${IMAGE}:amd64-${META_TAG}" sh "docker push ${IMAGE}:amd64-${META_TAG}"
sh "docker push ${IMAGE}:arm32v7-${META_TAG}" sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
sh "docker push ${IMAGE}:arm64v8-${META_TAG}" sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
sh "docker push ${IMAGE}:amd64-3.9" sh "docker push ${IMAGE}:amd64-3.1"
sh "docker push ${IMAGE}:arm32v7-3.9" sh "docker push ${IMAGE}:arm32v7-3.1"
sh "docker push ${IMAGE}:arm64v8-3.9" sh "docker push ${IMAGE}:arm64v8-3.1"
sh "docker manifest push --purge ${IMAGE}:3.9 || :" sh "docker manifest push --purge ${IMAGE}:3.1 || :"
sh "docker manifest create ${IMAGE}:3.9 ${IMAGE}:amd64-3.9 ${IMAGE}:arm32v7-3.9 ${IMAGE}:arm64v8-3.9" sh "docker manifest create ${IMAGE}:3.1 ${IMAGE}:amd64-3.1 ${IMAGE}:arm32v7-3.1 ${IMAGE}:arm64v8-3.1"
sh "docker manifest annotate ${IMAGE}:3.9 ${IMAGE}:arm32v7-3.9 --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:3.1 ${IMAGE}:arm32v7-3.1 --os linux --arch arm"
sh "docker manifest annotate ${IMAGE}:3.9 ${IMAGE}:arm64v8-3.9 --os linux --arch arm64 --variant v8" sh "docker manifest annotate ${IMAGE}:3.1 ${IMAGE}:arm64v8-3.1 --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:3.9" sh "docker manifest push --purge ${IMAGE}:3.1"
sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
} }
} }

2
jenkins-vars.yml
View file

@ -4,7 +4,7 @@
project_name: docker-baseimage-alpine project_name: docker-baseimage-alpine
external_type: os external_type: os
release_type: stable release_type: stable
release_tag: 3.9 release_tag: 3.10
ls_branch: master ls_branch: master
repo_vars: repo_vars:
- BUILD_VERSION_ARG = 'OS' - BUILD_VERSION_ARG = 'OS'