mirror of
https://github.com/linuxserver/docker-keepassxc.git
synced 2026-03-30 00:03:08 +08:00
Merge pull request #3 from linuxserver/alpine-320
rebase to Alpine 3.20
This commit is contained in:
commit
0cccee9e8e
4
.github/workflows/external_trigger.yml
vendored
4
.github/workflows/external_trigger.yml
vendored
@ -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_KEEPASSXC_MASTER\". ****"
|
||||
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_KEEPASSXC_MASTER\`" >> $GITHUB_STEP_SUMMARY
|
||||
echo "**** Retrieving external version ****"
|
||||
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
&& awk '/^P:'"keepassxc"'$/,/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.19/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"keepassxc"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
|
||||
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"keepassxc"'$/,/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 keepassxc tag latest is detected, however not all arch repos are updated yet. Will try again later."
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
|
||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine320
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -17,7 +17,7 @@ RUN \
|
||||
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/keepassxc-logo.png && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${KEEPASSXC_VERSION+x} ]; then \
|
||||
KEEPASSXC_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
KEEPASSXC_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
&& awk '/^P:keepassxc$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
|
||||
fi && \
|
||||
apk add --no-cache \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
|
||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine320
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -17,7 +17,7 @@ RUN \
|
||||
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/keepassxc-logo.png && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${KEEPASSXC_VERSION+x} ]; then \
|
||||
KEEPASSXC_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
KEEPASSXC_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
&& awk '/^P:keepassxc$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
|
||||
fi && \
|
||||
apk add --no-cache \
|
||||
|
||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -25,8 +25,8 @@ pipeline {
|
||||
DEV_DOCKERHUB_IMAGE = 'lsiodev/keepassxc'
|
||||
PR_DOCKERHUB_IMAGE = 'lspipepr/keepassxc'
|
||||
DIST_IMAGE = 'alpine'
|
||||
DIST_TAG = '3.19'
|
||||
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
|
||||
DIST_TAG = '3.20'
|
||||
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/community/'
|
||||
DIST_REPO_PACKAGES = 'keepassxc'
|
||||
MULTIARCH = 'true'
|
||||
CI = 'true'
|
||||
|
||||
@ -328,4 +328,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **23.05.24:** - Rebase to Alpine 3.20.
|
||||
* **10.04.24:** - Initial release.
|
||||
|
||||
@ -16,8 +16,8 @@ repo_vars:
|
||||
- DEV_DOCKERHUB_IMAGE = 'lsiodev/keepassxc'
|
||||
- PR_DOCKERHUB_IMAGE = 'lspipepr/keepassxc'
|
||||
- DIST_IMAGE = 'alpine'
|
||||
- DIST_TAG = '3.19'
|
||||
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
|
||||
- DIST_TAG = '3.20'
|
||||
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/community/'
|
||||
- DIST_REPO_PACKAGES = 'keepassxc'
|
||||
- MULTIARCH = 'true'
|
||||
- CI = 'true'
|
||||
|
||||
@ -91,4 +91,5 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "23.05.24:", desc: "Rebase to Alpine 3.20." }
|
||||
- { date: "10.04.24:", desc: "Initial release." }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user