Skip to content

Commit ecdeba3

Browse files
thelamerthelamer
authored
Merge pull request #7 from linuxserver/rebase
rebase to new alpine 317 baseimage
2 parents 972dbe9 + 94cb818 commit ecdeba3

File tree

18 files changed

+124
-128
lines changed

18 files changed

+124
-128
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

+11-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,20 +7,29 @@ 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 \
1720
libreoffice==${LIBREOFFICE_VERSION} \
1821
openjdk8-jre \
22+
st \
23+
thunar \
1924
tint2 && \
2025
echo "**** openbox tweaks ****" && \
2126
sed -i \
2227
's/NLMC/NLIMC/g' \
2328
/etc/xdg/openbox/rc.xml && \
29+
sed -i 's|</applications>| <application title="LibreOffice" type="normal">\n <maximized>yes</maximized>\n </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
30+
sed -i \
31+
'/Icon=/c Icon=xterm-color_48x48' \
32+
/usr/share/applications/st.desktop && \
2433
echo "**** cleanup ****" && \
2534
rm -rf \
2635
/tmp/*

‎Dockerfile.aarch64

+11-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,20 +7,29 @@ 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 \
1720
libreoffice==${LIBREOFFICE_VERSION} \
1821
openjdk8-jre \
22+
st \
23+
thunar \
1924
tint2 && \
2025
echo "**** openbox tweaks ****" && \
2126
sed -i \
2227
's/NLMC/NLIMC/g' \
2328
/etc/xdg/openbox/rc.xml && \
29+
sed -i 's|</applications>| <application title="LibreOffice" type="normal">\n <maximized>yes</maximized>\n </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
30+
sed -i \
31+
'/Icon=/c Icon=xterm-color_48x48' \
32+
/usr/share/applications/st.desktop && \
2433
echo "**** cleanup ****" && \
2534
rm -rf \
2635
/tmp/*

‎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
}
@@ -492,41 +492,6 @@ pipeline {
492492
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
493493
}
494494
}
495-
stage('Build ARMHF') {
496-
agent {
497-
label 'ARMHF'
498-
}
499-
steps {
500-
echo "Running on node: ${NODE_NAME}"
501-
echo 'Logging into Github'
502-
sh '''#! /bin/bash
503-
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
504-
'''
505-
sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
506-
sh "docker buildx build \
507-
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
508-
--label \"org.opencontainers.image.authors=linuxserver.io\" \
509-
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-libreoffice/packages\" \
510-
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-libreoffice\" \
511-
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-libreoffice\" \
512-
--label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
513-
--label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
514-
--label \"org.opencontainers.image.vendor=linuxserver.io\" \
515-
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
516-
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
517-
--label \"org.opencontainers.image.title=Libreoffice\" \
518-
--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.\" \
519-
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
520-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
521-
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
522-
retry(5) {
523-
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
524-
}
525-
sh '''docker rmi \
526-
${IMAGE}:arm32v7-${META_TAG} \
527-
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
528-
}
529-
}
530495
stage('Build ARM64') {
531496
agent {
532497
label 'ARM64'
@@ -677,9 +642,7 @@ pipeline {
677642
set -e
678643
docker pull ghcr.io/linuxserver/ci:latest
679644
if [ "${MULTIARCH}" == "true" ]; then
680-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
681645
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
682-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
683646
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
684647
fi
685648
docker run --rm \
@@ -795,56 +758,42 @@ pipeline {
795758
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
796759
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
797760
if [ "${CI}" == "false" ]; then
798-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
799-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
800761
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
801762
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
802763
fi
803764
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
804765
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
805766
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
806767
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
807-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
808-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
809-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
810768
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
811769
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
812770
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
813771
if [ -n "${SEMVER}" ]; then
814772
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
815-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
816773
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
817774
fi
818775
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
819776
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
820777
docker push ${MANIFESTIMAGE}:amd64-latest
821-
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
822-
docker push ${MANIFESTIMAGE}:arm32v7-latest
823-
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
824778
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
825779
docker push ${MANIFESTIMAGE}:arm64v8-latest
826780
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
827781
if [ -n "${SEMVER}" ]; then
828782
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
829-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
830783
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
831784
fi
832785
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
833-
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
834-
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
786+
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
835787
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
836788
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
837-
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
838-
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
789+
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
839790
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
840791
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
841-
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
842-
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
792+
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
843793
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
844794
if [ -n "${SEMVER}" ]; then
845795
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
846-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
847-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
796+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
848797
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
849798
fi
850799
docker manifest push --purge ${MANIFESTIMAGE}:latest
@@ -862,21 +811,16 @@ pipeline {
862811
${DELETEIMAGE}:amd64-${META_TAG} \
863812
${DELETEIMAGE}:amd64-latest \
864813
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
865-
${DELETEIMAGE}:arm32v7-${META_TAG} \
866-
${DELETEIMAGE}:arm32v7-latest \
867-
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
868814
${DELETEIMAGE}:arm64v8-${META_TAG} \
869815
${DELETEIMAGE}:arm64v8-latest \
870816
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
871817
if [ -n "${SEMVER}" ]; then
872818
docker rmi \
873819
${DELETEIMAGE}:amd64-${SEMVER} \
874-
${DELETEIMAGE}:arm32v7-${SEMVER} \
875820
${DELETEIMAGE}:arm64v8-${SEMVER} || :
876821
fi
877822
done
878823
docker rmi \
879-
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
880824
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
881825
'''
882826
}

0 commit comments

Comments
 (0)