Skip to content

Commit 5452083

Browse files
authored
Merge pull request #16 from linuxserver/alpine319
rebase to Alpine 3.19
2 parents 8280142 + 7e626fb commit 5452083

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_FILEZILLA_MASTER\". ****"
2121
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_FILEZILLA_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:'"filezilla"'$/,/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:'"filezilla"'$/,/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:'"filezilla"'$/,/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 filezilla 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=Filezilla
1313
RUN \
1414
echo "**** install packages ****" && \
1515
if [ -z ${FILEZILLA_VERSION+x} ]; then \
16-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1717
&& awk '/^P:filezilla$/,/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=Filezilla
1313
RUN \
1414
echo "**** install packages ****" && \
1515
if [ -z ${FILEZILLA_VERSION+x} ]; then \
16-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1717
&& awk '/^P:filezilla$/,/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/filezilla'
2525
PR_DOCKERHUB_IMAGE = 'lspipepr/filezilla'
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 = 'filezilla'
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
* **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
331332
* **13.05.23:** - Rebase to Alpine 3.18.
332333
* **18.03.23:** - Rebase to KasmVNC base image.

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/filezilla'
1717
- PR_DOCKERHUB_IMAGE = 'lspipepr/filezilla'
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 = 'filezilla'
2222
- MULTIARCH = 'true'
2323
- CI = 'true'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ app_setup_block: |
6868
This container is capable of delivering a true lossless image at a high framerate to your web browser by changing the Stream Quality preset to "Lossless", more information [here](https://www.kasmweb.com/docs/latest/how_to/lossless.html#technical-background). In order to use this mode from a non localhost endpoint the HTTPS port on 3001 needs to be used. If using a reverse proxy to port 3000 specific headers will need to be set as outlined [here](https://github.com/linuxserver/docker-baseimage-kasmvnc#lossless).
6969
# changelog
7070
changelogs:
71+
- {date: "02.01.24:", desc: "Rebase to Alpine 3.19."}
7172
- {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
7273
- {date: "13.05.23:", desc: "Rebase to Alpine 3.18."}
7374
- {date: "18.03.23:", desc: "Rebase to KasmVNC base image."}

0 commit comments

Comments
 (0)