Skip to content

Commit be79a49

Browse files
authored
#348 avoid download errors (#349)
1 parent d323e96 commit be79a49

9 files changed

Lines changed: 41 additions & 42 deletions

Dockerfile

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,29 @@ RUN if [ "${USE_APT_PROXY}" = "Y" ]; then \
2020
echo "Building without apt proxy"; \
2121
fi
2222

23+
# copy assets
24+
RUN mkdir -p /app/assets/sourceforge
25+
COPY app/assets/sourceforge/*tar.gz /app/assets/sourceforge/
26+
2327
RUN mkdir -p /app/bin
2428

25-
# copy installer files
29+
# create install directory and set if as workdir
2630
RUN mkdir -p /app/install
31+
WORKDIR /app/install
2732

33+
# install dependencies
2834
COPY install/install-dep.sh /app/install/
29-
COPY install/installer.sh /app/install/
30-
COPY install/remove-dep.sh /app/install/
31-
32-
RUN chmod u+x /app/install/*.sh
33-
35+
RUN chmod u+x /app/install/install-dep.sh
3436
RUN /app/install/install-dep.sh
3537

36-
WORKDIR /app/install
37-
3838
# execute installation
39+
COPY install/installer.sh /app/install/
40+
RUN chmod u+x /app/install/installer.sh
3941
RUN /app/install/installer.sh
4042

43+
# remove unnecessary dependencies
44+
COPY install/remove-dep.sh /app/install/
45+
RUN chmod u+x /app/install/remove-dep.sh
4146
RUN /app/install/remove-dep.sh
4247

4348
RUN rm /app/install/install-dep.sh
@@ -55,6 +60,9 @@ RUN rm -rf /var/lib/apt/lists/*
5560
# remove scripts
5661
RUN rm -Rf /app/install
5762

63+
# remove sourceforge assets
64+
RUN rm -Rf /app/assets/sourceforge
65+
5866
FROM scratch
5967
COPY --from=base / /
6068

5.49 MB
Binary file not shown.
2.6 MB
Binary file not shown.
2.17 MB
Binary file not shown.
2.26 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.

doc/release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Older build might be dropped in order to save space on docker-hub and incur in l
1010

1111
Date|Type|Description
1212
:---|:---|:---
13+
2025-11-10|Maintenance|Avoid download errors by including sf binaries (see [#348](https://github.com/GioF71/squeezelite-docker/issues/348))
1314
2025-08-26|Bugfix|Stick to bookworm until bugs are addressed, also avoid silent errors (see [#345](https://github.com/GioF71/squeezelite-docker/issues/345) and [#344](https://github.com/GioF71/squeezelite-docker/issues/344))
1415
2025-08-10|Maintenance|Fixed r2 build, would not find libasound2
1516
2025-06-30|Improvement|Complete support for alsa equalizer plugin, we do not require to create a custom asound.conf file anymore (see [#338](https://github.com/GioF71/squeezelite-docker/issues/338))

install/installer.sh

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,53 +24,43 @@ arch_amd64=x86_64
2424
arch_arm_v7=armv7l
2525
arch_arm_v8=aarch64
2626

27-
url_left="https://sourceforge.net/projects/lmsclients/files/squeezelite/linux/"
28-
url_right="/download"
27+
declare -A alsa_file_dict
28+
alsa_file_dict[$arch_amd64]="squeezelite-2.0.0.1541-x86_64.tar.gz"
29+
alsa_file_dict[$arch_arm_v8]="squeezelite-2.0.0.1541-aarch64.tar.gz"
30+
alsa_file_dict[$arch_arm_v7]="squeezelite-2.0.0.1541-armhf.tar.gz"
2931

30-
declare -A url_middle_alsa_dict
31-
url_middle_alsa_dict[$arch_amd64]="squeezelite-2.0.0.1541-x86_64.tar.gz"
32-
url_middle_alsa_dict[$arch_arm_v7]="squeezelite-2.0.0.1541-armhf.tar.gz"
33-
url_middle_alsa_dict[$arch_arm_v8]="squeezelite-2.0.0.1541-aarch64.tar.gz"
34-
35-
declare -A url_middle_pulse_dict
36-
url_middle_pulse_dict[$arch_amd64]="squeezelite-pulse-2.0.0.1541-x86_64.tar.gz"
37-
url_middle_pulse_dict[$arch_arm_v7]="squeezelite-pulse-1.9.9.1392-armhf.tar.gz"
38-
url_middle_pulse_dict[$arch_arm_v8]="squeezelite-pulse-2.0.0.1541-aarch64.tar.gz"
32+
declare -A pulse_file_dict
33+
pulse_file_dict[$arch_amd64]="squeezelite-pulse-2.0.0.1541-x86_64.tar.gz"
34+
pulse_file_dict[$arch_arm_v8]="squeezelite-pulse-2.0.0.1541-aarch64.tar.gz"
3935

4036
if [[ "${BUILD_MODE}" == "sf" ]]; then
41-
apt-get install wget -y
42-
#ARCH=`uname -m`
43-
mkdir /assets
44-
mkdir -p /assets/sourceforge
4537
if [[ "${BINARY_MODE}" == "full" ]] || [[ "${BINARY_MODE}" == "alsa" ]]; then
46-
SL_URL=${url_middle_alsa_dict["${ARCH}"]};
47-
if [[ -n "${url_left}${SL_URL}${url_right}" ]]; then
48-
echo "Found Alsa version for architecture ${ARCH}, downloading ..."
49-
wget "${url_left}${SL_URL}${url_right}" -O /assets/sourceforge/squeezelite.tar.gz
50-
mkdir /assets/sourceforge/expanded
51-
tar xzvf /assets/sourceforge/squeezelite.tar.gz -C /assets/sourceforge/expanded
52-
ls -la /assets/sourceforge/expanded/
53-
mv /assets/sourceforge/expanded/squeezelite $OUTPUT_FILE
38+
SL_ALSA_FILENAME=${alsa_file_dict["${ARCH}"]};
39+
if [[ -n "${SL_ALSA_FILENAME}" ]]; then
40+
echo "Found Alsa version for architecture ${ARCH}, decompressing ..."
41+
mkdir -p /app/assets/sourceforge/expanded
42+
tar xzvf "/app/assets/sourceforge/${SL_ALSA_FILENAME}" -C /app/assets/sourceforge/expanded
43+
ls -la /app/assets/sourceforge/expanded/
44+
mv /app/assets/sourceforge/expanded/squeezelite $OUTPUT_FILE
5445
else
55-
echo "NOT Found Alsa version for architecture ${ARCH}. This was mandatory, exiting!"
46+
echo "NOT Found Alsa version for architecture ${ARCH}, exiting!"
5647
exit 1
5748
fi
5849
fi
5950
if [[ "${BINARY_MODE}" == "full" ]] || [[ "${BINARY_MODE}" == "pulse" ]]; then
60-
SL_URL_PULSE=${url_middle_pulse_dict["${ARCH}"]};
61-
if [[ -n "${url_left}${SL_URL_PULSE}${url_right}" ]]; then
62-
echo "Found PulseAudio version for architecture ${ARCH}, downloading ..."
63-
wget "${url_left}${SL_URL_PULSE}${url_right}" -O /assets/sourceforge/squeezelite-pulse.tar.gz
64-
mkdir /assets/sourceforge/expanded-pulse
65-
tar xzvf /assets/sourceforge/squeezelite-pulse.tar.gz -C /assets/sourceforge/expanded-pulse
66-
ls -la /assets/sourceforge/expanded-pulse/
67-
mv /assets/sourceforge/expanded-pulse/squeezelite $OUTPUT_FILE_PULSE
51+
SL_PULSE_FILENAME=${pulse_file_dict["${ARCH}"]};
52+
if [[ -n "${SL_PULSE_FILENAME}" ]]; then
53+
echo "Found PulseAudio version for architecture ${ARCH}, decompressing ..."
54+
mkdir -p /app/assets/sourceforge/expanded-pulse
55+
tar xzvf "/app/assets/sourceforge/${SL_PULSE_FILENAME}" -C /app/assets/sourceforge/expanded-pulse
56+
ls -la /app/assets/sourceforge/expanded-pulse/
57+
mv /app/assets/sourceforge/expanded-pulse/squeezelite $OUTPUT_FILE_PULSE
6858
else
69-
echo "NOT Found PulseAudio version for architecture ${ARCH}. This was not mandatory."
59+
echo "NOT Found PulseAudio version for architecture ${ARCH}, exiting!"
60+
exit 1
7061
fi
7162
fi
7263
# cleanup
73-
apt-get purge wget -y
7464
apt-get autoremove -y
7565
rm -Rf /assets
7666
elif [[ "${BUILD_MODE}" == "r2" ]]; then

0 commit comments

Comments
 (0)