Skip to content

Commit a029924

Browse files
authored
Merge pull request #12 from linuxserver/selkies
selkies branch
2 parents d501a98 + 25688e6 commit a029924

13 files changed

Lines changed: 84 additions & 70 deletions

.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 \`pidgin_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:'"pidgin"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
3434
echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
3535
if grep -q "^pidgin_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:'"pidgin"'$/,/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:'"pidgin"'$/,/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 pidgin 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as plugins
2+
FROM ghcr.io/linuxserver/baseimage-alpine:3.22 AS plugins
33

44
RUN \
55
echo "**** install dev deps ****" && \
@@ -102,7 +102,7 @@ RUN \
102102
make DESTDIR="/buildout" install
103103

104104
# runtime stage
105-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine321
105+
FROM ghcr.io/linuxserver/baseimage-selkies:alpine322
106106

107107
# set version label
108108
ARG BUILD_DATE
@@ -121,11 +121,11 @@ COPY --from=plugins /buildout/ /
121121
RUN \
122122
echo "**** add icon ****" && \
123123
curl -o \
124-
/kclient/public/icon.png \
124+
/usr/share/selkies/www/icon.png \
125125
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/pidgin-logo.png && \
126126
echo "**** install packages ****" && \
127127
if [ -z ${PIDGIN_VERSION+x} ]; then \
128-
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
128+
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
129129
&& awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
130130
fi && \
131131
apk add --no-cache \

Dockerfile.aarch64

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 as plugins
2+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22 AS plugins
33

44
RUN \
55
echo "**** install dev deps ****" && \
@@ -102,7 +102,7 @@ RUN \
102102
make DESTDIR="/buildout" install
103103

104104
# runtime stage
105-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine321
105+
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-alpine322
106106

107107
# set version label
108108
ARG BUILD_DATE
@@ -121,11 +121,11 @@ COPY --from=plugins /buildout/ /
121121
RUN \
122122
echo "**** add icon ****" && \
123123
curl -o \
124-
/kclient/public/icon.png \
124+
/usr/share/selkies/www/icon.png \
125125
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/pidgin-logo.png && \
126126
echo "**** install packages ****" && \
127127
if [ -z ${PIDGIN_VERSION+x} ]; then \
128-
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
128+
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
129129
&& awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
130130
fi && \
131131
apk add --no-cache \

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/pidgin'
2828
PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin'
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 = 'pidgin'
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 = '160'
3939
CI_DOCKERENV = 'TZ=US/Pacific'
4040
CI_AUTH = 'user:password'

0 commit comments

Comments
 (0)