Skip to content

Commit aa503b9

Browse files
committed
rebase to alpine 3.14
1 parent 4391867 commit aa503b9

File tree

8 files changed

+10
-8
lines changed

8 files changed

+10
-8
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fi
1919
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_FILEZILLA_MASTER\". ****"
2020
echo "**** Retrieving external version ****"
21-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
21+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2222
&& awk '/^P:'"filezilla"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
2323
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2424
echo "**** Can't retrieve external version, exiting ****"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN \
1212
apk add --no-cache --virtual=build-dependencies \
1313
curl && \
1414
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
15+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1616
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1717
fi && \
1818
apk add --no-cache \

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN \
1212
apk add --no-cache --virtual=build-dependencies \
1313
curl && \
1414
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
15+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1616
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1717
fi && \
1818
apk add --no-cache \

Dockerfile.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN \
1212
apk add --no-cache --virtual=build-dependencies \
1313
curl && \
1414
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
15+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1616
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1717
fi && \
1818
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.13'
28-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/community/'
27+
DIST_TAG = '3.14'
28+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/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
@@ -225,4 +225,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
225225

226226
## Versions
227227

228+
* **26.09.21:** - Rebase to Alpine 3.14.
228229
* **18.04.21:** - Initial release.

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ repo_vars:
1515
- DEV_DOCKERHUB_IMAGE = 'lsiodev/filezilla'
1616
- PR_DOCKERHUB_IMAGE = 'lspipepr/filezilla'
1717
- DIST_IMAGE = 'alpine'
18-
- DIST_TAG = '3.13'
19-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/community/'
18+
- DIST_TAG = '3.14'
19+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
2020
- DIST_REPO_PACKAGES = 'filezilla'
2121
- MULTIARCH = 'true'
2222
- CI = 'true'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@ app_setup_block: |
4343
4444
# changelog
4545
changelogs:
46+
- { date: "26.09.21:", desc: "Rebase to Alpine 3.14." }
4647
- { date: "18.04.21:", desc: "Initial release." }

0 commit comments

Comments
 (0)