Skip to content

Commit 7a8ee61

Browse files
committed
selkies branch
1 parent 2cdddba commit 7a8ee61

File tree

15 files changed

+97
-69
lines changed

15 files changed

+97
-69
lines changed

.editorconfig

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.bug.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.feature.yml

100755100644
File mode changed.

.github/workflows/call_issue_pr_tracker.yml

100755100644
File mode changed.

.github/workflows/call_issues_cron.yml

100755100644
File mode changed.

.github/workflows/external_trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
echo "> External trigger running off of master branch. To disable this trigger, add \`libreoffice_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
32+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
3333
&& awk '/^P:'"libreoffice"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
3434
echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
3535
if grep -q "^libreoffice_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
@@ -107,7 +107,7 @@ jobs:
107107
if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
108108
echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
109109
exit 0
110-
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"libreoffice"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
110+
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"libreoffice"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
111111
echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
112112
FAILURE_REASON="New version ${EXT_RELEASE} for libreoffice tag latest is detected, however not all arch repos are updated yet. Will try again later."
113113
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,

.github/workflows/permissions.yml

100755100644
File mode changed.

Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine321
1+
FROM ghcr.io/linuxserver/baseimage-selkies:alpine322
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,16 +8,17 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thelamer"
99

1010
# title
11-
ENV TITLE=LibreOffice
11+
ENV TITLE=LibreOffice \
12+
NO_GAMEPAD=true
1213

1314
RUN \
1415
echo "**** add icon ****" && \
1516
curl -o \
16-
/kclient/public/icon.png \
17+
/usr/share/selkies/www/icon.png \
1718
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/libreoffice-logo.png && \
1819
echo "**** install packages ****" && \
1920
if [ -z ${LIBREOFFICE_VERSION+x} ]; then \
20-
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
21+
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2122
&& awk '/^P:libreoffice$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2223
fi && \
2324
apk add --no-cache \
@@ -37,6 +38,10 @@ RUN \
3738
sed -i \
3839
'/Icon=/c Icon=xterm-color_48x48' \
3940
/usr/share/applications/st.desktop && \
41+
echo "**** application tweaks ****" && \
42+
mv \
43+
/usr/bin/thunar \
44+
/usr/bin/thunar-real && \
4045
echo "**** cleanup ****" && \
4146
rm -rf \
4247
/tmp/*

Dockerfile.aarch64

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine321
1+
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-alpine322
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,16 +8,17 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thelamer"
99

1010
# title
11-
ENV TITLE=LibreOffice
11+
ENV TITLE=LibreOffice \
12+
NO_GAMEPAD=true
1213

1314
RUN \
1415
echo "**** add icon ****" && \
1516
curl -o \
16-
/kclient/public/icon.png \
17+
/usr/share/selkies/www/icon.png \
1718
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/libreoffice-logo.png && \
1819
echo "**** install packages ****" && \
1920
if [ -z ${LIBREOFFICE_VERSION+x} ]; then \
20-
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
21+
LIBREOFFICE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2122
&& awk '/^P:libreoffice$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2223
fi && \
2324
apk add --no-cache \
@@ -37,6 +38,10 @@ RUN \
3738
sed -i \
3839
'/Icon=/c Icon=xterm-color_48x48' \
3940
/usr/share/applications/st.desktop && \
41+
echo "**** application tweaks ****" && \
42+
mv \
43+
/usr/bin/thunar \
44+
/usr/bin/thunar-real && \
4045
echo "**** cleanup ****" && \
4146
rm -rf \
4247
/tmp/*

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ pipeline {
2727
DEV_DOCKERHUB_IMAGE = 'lsiodev/libreoffice'
2828
PR_DOCKERHUB_IMAGE = 'lspipepr/libreoffice'
2929
DIST_IMAGE = 'alpine'
30-
DIST_TAG = '3.21'
31-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.21/community/'
30+
DIST_TAG = '3.22'
31+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/community/'
3232
DIST_REPO_PACKAGES = 'libreoffice'
3333
MULTIARCH = 'true'
3434
CI = 'true'
3535
CI_WEB = 'true'
36-
CI_PORT = '3000'
37-
CI_SSL = 'false'
36+
CI_PORT = '3001'
37+
CI_SSL = 'true'
3838
CI_DELAY = '120'
3939
CI_DOCKERENV = 'TZ=US/Pacific'
4040
CI_AUTH = 'user:password'

0 commit comments

Comments
 (0)