Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fi
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PIDGIN_MASTER\". ****"
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:'"pidgin"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM lsiobase/alpine:3.14 as plugins
FROM lsiobase/alpine:3.15 as plugins

RUN \
echo "**** install dev deps ****" && \
Expand Down Expand Up @@ -117,13 +117,12 @@ RUN \
apk add --no-cache --virtual=build-dependencies \
curl && \
if [ -z ${PIDGIN_VERSION+x} ]; then \
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \
discount \
firefox-esr \
leafpad \
libpurple-bonjour \
libpurple-xmpp \
libwebp \
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,12 @@ RUN \
apk add --no-cache --virtual=build-dependencies \
curl && \
if [ -z ${PIDGIN_VERSION+x} ]; then \
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \
discount \
firefox-esr \
leafpad \
libpurple-bonjour \
libpurple-xmpp \
libwebp \
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,12 @@ RUN \
apk add --no-cache --virtual=build-dependencies \
curl && \
if [ -z ${PIDGIN_VERSION+x} ]; then \
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \
discount \
firefox-esr \
leafpad \
libpurple-bonjour \
libpurple-xmpp \
libwebp \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ pipeline {
DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin'
PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin'
DIST_IMAGE = 'alpine'
DIST_TAG = '3.14'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
DIST_TAG = '3.15'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/community/'
DIST_REPO_PACKAGES = 'pidgin'
MULTIARCH = 'true'
CI = 'true'
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,5 +248,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **23.12.21:** - Rebase to Alpine 3.15.
* **26.09.21:** - Rebase to Alpine 3.14.
* **14.05.21:** - Initial release.
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ repo_vars:
- DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin'
- PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin'
- DIST_IMAGE = 'alpine'
- DIST_TAG = '3.14'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
- DIST_TAG = '3.15'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/community/'
- DIST_REPO_PACKAGES = 'pidgin'
- MULTIARCH = 'true'
- CI = 'true'
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@ app_setup_block: |

# changelog
changelogs:
- { date: "23.12.21:", desc: "Rebase to Alpine 3.15." }
- { date: "26.09.21:", desc: "Rebase to Alpine 3.14." }
- { date: "14.05.21:", desc: "Initial release." }
1 change: 0 additions & 1 deletion root/defaults/menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<openbox_menu xmlns="http://openbox.org/3.4/menu">
<menu id="root-menu" label="MENU">
<item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
<item label="Leafpad" icon="/usr/share/icons/hicolor/32x32/apps/leafpad.png"><action name="Execute"><command>/usr/bin/leafpad</command></action></item>
<item label="Firefox" icon="/usr/share/icons/hicolor/48x48/apps/firefox.png"><action name="Execute"><command>/usr/bin/firefox</command></action></item>
<item label="Reload OB"><action name="Reconfigure"/></item>
</menu>
Expand Down