LinuxServer.io/docker-libreoffice
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-libreoffice.git synced 2026-06-03 09:57:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from linuxserver/alpine319

Browse Source 
rebase to alpine 3.19
This commit is contained in:
Ryan Kuba
2024-01-03 10:17:17 -08:00
committed by GitHub
parent 81dc42a5d5 e72fb1a84d
commit a79eafe54e
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/external_trigger.yml
+2 -2
View File
@@ -20,7 +20,7 @@ jobs:
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_LIBREOFFICE_MASTER\". ****"
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_LIBREOFFICE_MASTER\`" >> $GITHUB_STEP_SUMMARY
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:'"libreoffice"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
@@ -74,7 +74,7 @@ jobs:
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
exit 0
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"libreoffice"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"libreoffice"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
FAILURE_REASON="New version ${EXT_RELEASE} for libreoffice tag latest is detected, however not all arch repos are updated yet. Will try again later."
Dockerfile
+2 -2
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
# set version label
ARG BUILD_DATE
@@ -13,7 +13,7 @@ ENV TITLE=LibreOffice
RUN \
echo "**** install packages ****" && \
if [ -z ${LIBREOFFICE_VERSION+x} ]; then \
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:libreoffice$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \
Dockerfile.aarch64
+2 -2
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
# set version label
ARG BUILD_DATE
@@ -13,7 +13,7 @@ ENV TITLE=LibreOffice
RUN \
echo "**** install packages ****" && \
if [ -z ${LIBREOFFICE_VERSION+x} ]; then \
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:libreoffice$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \
Jenkinsfile
Vendored
+2 -2
View File
@@ -24,8 +24,8 @@ pipeline {
DEV_DOCKERHUB_IMAGE = 'lsiodev/libreoffice'
PR_DOCKERHUB_IMAGE = 'lspipepr/libreoffice'
DIST_IMAGE = 'alpine'
DIST_TAG = '3.18'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
DIST_TAG = '3.19'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
DIST_REPO_PACKAGES = 'libreoffice'
MULTIARCH = 'true'
CI = 'true'
README.md
+1
View File
@@ -327,6 +327,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **02.01.24:** - Rebase to Alpine 3.19.
* **13.05.23:** - Rebase to Alpine 3.18.
* **18.03.23:** - Rebase to KasmVNC base image.
* **21.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.
jenkins-vars.yml
+2 -2
View File
@@ -16,8 +16,8 @@ repo_vars:
- DEV_DOCKERHUB_IMAGE = 'lsiodev/libreoffice'
- PR_DOCKERHUB_IMAGE = 'lspipepr/libreoffice'
- DIST_IMAGE = 'alpine'
- DIST_TAG = '3.18'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
- DIST_TAG = '3.19'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
- DIST_REPO_PACKAGES = 'libreoffice'
- MULTIARCH = 'true'
- CI = 'true'
readme-vars.yml
+1
View File
@@ -74,6 +74,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "02.01.24:", desc: "Rebase to Alpine 3.19." }
- { date: "13.05.23:", desc: "Rebase to Alpine 3.18." }
- { date: "18.03.23:", desc: "Rebase to KasmVNC base image." }
- { date: "21.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }