Skip to content

Commit e837f01

Browse files
thelamerthelamer
authored
Merge pull request #5 from linuxserver/3.15
3.15
2 parents d25d995 + ce8135e commit e837f01

File tree

10 files changed

+67
-47
lines changed

10 files changed

+67
-47
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.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
21+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thelamer"
99

1010
RUN \
11-
echo "**** install packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
curl && \
14-
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16-
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
17-
fi && \
18-
apk add --no-cache \
19-
filezilla==${FILEZILLA_VERSION} && \
20-
echo "**** cleanup ****" && \
21-
apk del --purge \
22-
build-dependencies && \
23-
rm -rf \
24-
/tmp/*
11+
echo "**** install packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
curl && \
14+
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
17+
fi && \
18+
apk add --no-cache \
19+
filezilla==${FILEZILLA_VERSION} \
20+
filezilla-lang && \
21+
echo "**** cleanup ****" && \
22+
apk del --purge \
23+
build-dependencies && \
24+
rm -rf \
25+
/tmp/*
2526

2627
# add local files
2728
COPY /root /

‎Dockerfile.aarch64

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thelamer"
99

1010
RUN \
11-
echo "**** install packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
curl && \
14-
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16-
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
17-
fi && \
18-
apk add --no-cache \
19-
filezilla==${FILEZILLA_VERSION} && \
20-
echo "**** cleanup ****" && \
21-
apk del --purge \
22-
build-dependencies && \
23-
rm -rf \
24-
/tmp/*
11+
echo "**** install packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
curl && \
14+
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
17+
fi && \
18+
apk add --no-cache \
19+
filezilla==${FILEZILLA_VERSION} \
20+
filezilla-lang && \
21+
echo "**** cleanup ****" && \
22+
apk del --purge \
23+
build-dependencies && \
24+
rm -rf \
25+
/tmp/*
2526

2627
# add local files
2728
COPY /root /

‎Dockerfile.armhf

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thelamer"
99

1010
RUN \
11-
echo "**** install packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
curl && \
14-
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15-
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16-
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
17-
fi && \
18-
apk add --no-cache \
19-
filezilla==${FILEZILLA_VERSION} && \
20-
echo "**** cleanup ****" && \
21-
apk del --purge \
22-
build-dependencies && \
23-
rm -rf \
24-
/tmp/*
11+
echo "**** install packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
curl && \
14+
if [ -z ${FILEZILLA_VERSION+x} ]; then \
15+
FILEZILLA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
16+
&& awk '/^P:filezilla$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
17+
fi && \
18+
apk add --no-cache \
19+
filezilla==${FILEZILLA_VERSION} \
20+
filezilla-lang && \
21+
echo "**** cleanup ****" && \
22+
apk del --purge \
23+
build-dependencies && \
24+
rm -rf \
25+
/tmp/*
2526

2627
# add local files
2728
COPY /root /

‎Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ pipeline {
2525
DEV_DOCKERHUB_IMAGE = 'lsiodev/filezilla'
2626
PR_DOCKERHUB_IMAGE = 'lspipepr/filezilla'
2727
DIST_IMAGE = 'alpine'
28-
DIST_TAG = '3.14'
29-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
28+
DIST_TAG = '3.15'
29+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/community/'
3030
DIST_REPO_PACKAGES = 'filezilla'
3131
MULTIARCH = 'true'
3232
CI = 'true'

‎README.md

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

228228
## Versions
229229

230+
* **23.12.21:** - Rebase to Alpine 3.15.
230231
* **26.09.21:** - Rebase to Alpine 3.14.
231232
* **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.14'
19-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
18+
- DIST_TAG = '3.15'
19+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/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,5 +43,6 @@ app_setup_block: |
4343
4444
# changelog
4545
changelogs:
46+
- { date: "23.12.21:", desc: "Rebase to Alpine 3.15." }
4647
- { date: "26.09.21:", desc: "Rebase to Alpine 3.14." }
4748
- { date: "18.04.21:", desc: "Initial release." }

‎root/defaults/menu.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<openbox_menu xmlns="http://openbox.org/3.4/menu">
3+
<menu id="root-menu" label="MENU">
4+
<item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
5+
<item label="Filezilla" icon="/usr/share/icons/hicolor/48x48/apps/filezilla.png"><action name="Execute"><command>/usr/bin/filezilla</command></action></item>
6+
<item label="Reload OB"><action name="Reconfigure"/></item>
7+
</menu>
8+
</openbox_menu>

‎root/etc/cont-init.d/56-openboxcopy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
# default file copies first run
4+
[[ ! -f /config/.config/openbox/menu.xml ]] && \
5+
mkdir -p /config/.config/openbox && \
6+
cp /defaults/menu.xml /config/.config/openbox/menu.xml && \
7+
chown -R abc:abc /config/.config

0 commit comments

Comments
 (0)