Skip to content

Commit 5ad3f80

Browse files
thelamerthelamer
committed
rebase to new alpine 317 baseimage
1 parent 87a5b89 commit 5ad3f80

File tree

9 files changed

+92
-116
lines changed

9 files changed

+92
-116
lines changed

‎.github/ISSUE_TEMPLATE/issue.bug.yml

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ body:
5353
options:
5454
- x86-64
5555
- arm64
56-
- armhf
5756
validations:
5857
required: true
5958
- type: textarea

‎.github/workflows/external_trigger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fi
1919
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_LIBREOFFICE_MASTER\". ****"
2020
echo "**** Retrieving external version ****"
21-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
21+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2222
&& awk '/^P:'"libreoffice"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
2323
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2424
echo "**** Can't retrieve external version, exiting ****"

‎Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:3.16
1+
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine317
22

33
# set version label
44
ARG BUILD_DATE
@@ -7,10 +7,13 @@ ARG LIBREOFFICE_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
88
LABEL maintainer="thelamer"
99

10+
# title
11+
ENV TITLE=LibreOffice
12+
1013
RUN \
1114
echo "**** install packages ****" && \
1215
if [ -z ${LIBREOFFICE_VERSION+x} ]; then \
13-
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1417
&& awk '/^P:libreoffice$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1518
fi && \
1619
apk add --no-cache \

‎Dockerfile.aarch64

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-3.16
1+
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine317
22

33
# set version label
44
ARG BUILD_DATE
@@ -7,10 +7,13 @@ ARG LIBREOFFICE_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
88
LABEL maintainer="thelamer"
99

10+
# title
11+
ENV TITLE=LibreOffice
12+
1013
RUN \
1114
echo "**** install packages ****" && \
1215
if [ -z ${LIBREOFFICE_VERSION+x} ]; then \
13-
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1417
&& awk '/^P:libreoffice$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1518
fi && \
1619
apk add --no-cache \

‎Dockerfile.armhf

-34
This file was deleted.

‎Jenkinsfile

+9-65
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ pipeline {
2525
DEV_DOCKERHUB_IMAGE = 'lsiodev/libreoffice'
2626
PR_DOCKERHUB_IMAGE = 'lspipepr/libreoffice'
2727
DIST_IMAGE = 'alpine'
28-
DIST_TAG = '3.16'
29-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
28+
DIST_TAG = '3.17'
29+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/community/'
3030
DIST_REPO_PACKAGES = 'libreoffice'
3131
MULTIARCH = 'true'
3232
CI = 'true'
@@ -161,7 +161,7 @@ pipeline {
161161
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
162162
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
163163
if (env.MULTIARCH == 'true') {
164-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
164+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
165165
} else {
166166
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
167167
}
@@ -184,7 +184,7 @@ pipeline {
184184
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
185185
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
186186
if (env.MULTIARCH == 'true') {
187-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
187+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
188188
} else {
189189
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
190190
}
@@ -207,7 +207,7 @@ pipeline {
207207
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
208208
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
209209
if (env.MULTIARCH == 'true') {
210-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
210+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
211211
} else {
212212
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
213213
}
@@ -495,41 +495,6 @@ pipeline {
495495
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
496496
}
497497
}
498-
stage('Build ARMHF') {
499-
agent {
500-
label 'ARMHF'
501-
}
502-
steps {
503-
echo "Running on node: ${NODE_NAME}"
504-
echo 'Logging into Github'
505-
sh '''#! /bin/bash
506-
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
507-
'''
508-
sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
509-
sh "docker buildx build \
510-
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
511-
--label \"org.opencontainers.image.authors=linuxserver.io\" \
512-
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-libreoffice/packages\" \
513-
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-libreoffice\" \
514-
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-libreoffice\" \
515-
--label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
516-
--label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
517-
--label \"org.opencontainers.image.vendor=linuxserver.io\" \
518-
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
519-
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
520-
--label \"org.opencontainers.image.title=Libreoffice\" \
521-
--label \"org.opencontainers.image.description=[LibreOffice](https://www.libreoffice.org/) is a free and powerful office suite, and a successor to OpenOffice.org (commonly known as OpenOffice). Its clean interface and feature-rich tools help you unleash your creativity and enhance your productivity.\" \
522-
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
523-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
524-
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
525-
retry(5) {
526-
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
527-
}
528-
sh '''docker rmi \
529-
${IMAGE}:arm32v7-${META_TAG} \
530-
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
531-
}
532-
}
533498
stage('Build ARM64') {
534499
agent {
535500
label 'ARM64'
@@ -680,9 +645,7 @@ pipeline {
680645
set -e
681646
docker pull ghcr.io/linuxserver/ci:latest
682647
if [ "${MULTIARCH}" == "true" ]; then
683-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
684648
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
685-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
686649
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
687650
fi
688651
docker run --rm \
@@ -798,56 +761,42 @@ pipeline {
798761
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
799762
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
800763
if [ "${CI}" == "false" ]; then
801-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
802-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
803764
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
804765
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
805766
fi
806767
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
807768
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
808769
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
809770
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
810-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
811-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
812-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
813771
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
814772
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
815773
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
816774
if [ -n "${SEMVER}" ]; then
817775
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
818-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
819776
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
820777
fi
821778
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
822779
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
823780
docker push ${MANIFESTIMAGE}:amd64-latest
824-
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
825-
docker push ${MANIFESTIMAGE}:arm32v7-latest
826-
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
827781
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
828782
docker push ${MANIFESTIMAGE}:arm64v8-latest
829783
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
830784
if [ -n "${SEMVER}" ]; then
831785
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
832-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
833786
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
834787
fi
835788
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
836-
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
837-
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
789+
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
838790
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
839791
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
840-
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
841-
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
792+
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
842793
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
843794
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
844-
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
845-
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
795+
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
846796
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
847797
if [ -n "${SEMVER}" ]; then
848798
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
849-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
850-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
799+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
851800
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
852801
fi
853802
docker manifest push --purge ${MANIFESTIMAGE}:latest
@@ -865,21 +814,16 @@ pipeline {
865814
${DELETEIMAGE}:amd64-${META_TAG} \
866815
${DELETEIMAGE}:amd64-latest \
867816
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
868-
${DELETEIMAGE}:arm32v7-${META_TAG} \
869-
${DELETEIMAGE}:arm32v7-latest \
870-
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
871817
${DELETEIMAGE}:arm64v8-${META_TAG} \
872818
${DELETEIMAGE}:arm64v8-latest \
873819
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
874820
if [ -n "${SEMVER}" ]; then
875821
docker rmi \
876822
${DELETEIMAGE}:amd64-${SEMVER} \
877-
${DELETEIMAGE}:arm32v7-${SEMVER} \
878823
${DELETEIMAGE}:arm64v8-${SEMVER} || :
879824
fi
880825
done
881826
docker rmi \
882-
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
883827
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
884828
'''
885829
}

0 commit comments

Comments
 (0)