Skip to content

Commit 162b1e2

Browse files
authored
Merge pull request #10 from linuxserver/alpine319
rebase to alpine 3.19
2 parents c25c424 + eb3a5b9 commit 162b1e2

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

.github/workflows/external_trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SQLITEBROWSER_MASTER\". ****"
2121
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_SQLITEBROWSER_MASTER\`" >> $GITHUB_STEP_SUMMARY
2222
echo "**** Retrieving external version ****"
23-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
23+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2424
&& awk '/^P:'"sqlitebrowser"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
2525
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2626
echo "**** Can't retrieve external version, exiting ****"
@@ -74,7 +74,7 @@ jobs:
7474
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
7575
echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
7676
exit 0
77-
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"sqlitebrowser"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
77+
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"sqlitebrowser"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
7878
echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
7979
echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
8080
FAILURE_REASON="New version ${EXT_RELEASE} for sqlitebrowser tag latest is detected, however not all arch repos are updated yet. Will try again later."

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318
1+
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
22

33
# set version label
44
ARG BUILD_DATE
@@ -13,7 +13,7 @@ ENV TITLE=SQLiteBrowser
1313
RUN \
1414
echo "**** install packages ****" && \
1515
if [ -z ${SQLITEB_VERSION+x} ]; then \
16-
SQLITEB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
SQLITEB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1717
&& awk '/^P:sqlitebrowser$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1818
fi && \
1919
apk add --no-cache \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318
1+
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
22

33
# set version label
44
ARG BUILD_DATE
@@ -13,7 +13,7 @@ ENV TITLE=SQLiteBrowser
1313
RUN \
1414
echo "**** install packages ****" && \
1515
if [ -z ${SQLITEB_VERSION+x} ]; then \
16-
SQLITEB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
SQLITEB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1717
&& awk '/^P:sqlitebrowser$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1818
fi && \
1919
apk add --no-cache \

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ pipeline {
2424
DEV_DOCKERHUB_IMAGE = 'lsiodev/sqlitebrowser'
2525
PR_DOCKERHUB_IMAGE = 'lspipepr/sqlitebrowser'
2626
DIST_IMAGE = 'alpine'
27-
DIST_TAG = '3.18'
28-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
27+
DIST_TAG = '3.19'
28+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
2929
DIST_REPO_PACKAGES = 'sqlitebrowser'
3030
MULTIARCH='true'
3131
CI='true'

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
327327

328328
## Versions
329329

330+
* **02.01.24:** - Rebase to Alpine 3.19.
330331
* **13.05.23:** - Rebase to Alpine 3.18.
331332
* **18.03.23:** - Rebase to KasmVNC base image.
332333
* **23.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ repo_vars:
1616
- DEV_DOCKERHUB_IMAGE = 'lsiodev/sqlitebrowser'
1717
- PR_DOCKERHUB_IMAGE = 'lspipepr/sqlitebrowser'
1818
- DIST_IMAGE = 'alpine'
19-
- DIST_TAG = '3.18'
20-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
19+
- DIST_TAG = '3.19'
20+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
2121
- DIST_REPO_PACKAGES = 'sqlitebrowser'
2222
- MULTIARCH='true'
2323
- CI='true'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ app_setup_block: |
7373
7474
# changelog
7575
changelogs:
76+
- { date: "02.01.24:", desc: "Rebase to Alpine 3.19." }
7677
- { date: "13.05.23:", desc: "Rebase to Alpine 3.18." }
7778
- { date: "18.03.23:", desc: "Rebase to KasmVNC base image." }
7879
- { date: "23.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }

0 commit comments

Comments
 (0)