2
2
# check=error=true
3
3
4
4
# Default values for versions
5
- ARG THC_VERSION='0.36 .0' \
5
+ ARG THC_VERSION='0.39 .0' \
6
6
TINI_VERSION='0.19.0'
7
7
8
8
# Default values for variables that change less often
9
9
ARG DENO_DIR='/deno-dir' \
10
10
GH_BASE_URL='https://github.com' \
11
+ THC_PORT_NAME='PORT' \
11
12
HOST='0.0.0.0' \
12
13
PORT='8282'
13
14
@@ -30,15 +31,18 @@ RUN adduser -u 10001 -S appuser
30
31
# Stage for downloading files using curl from Debian
31
32
FROM dependabot-debian AS debian-curl
32
33
RUN DEBIAN_FRONTEND='noninteractive' && export DEBIAN_FRONTEND && \
33
- apt-get update && apt-get install -y curl
34
+ apt-get update && apt-get install -y curl xz-utils
34
35
35
36
# Download tiny-health-checker from GitHub
36
37
FROM debian-curl AS thc-download
37
38
ARG GH_BASE_URL THC_VERSION
38
39
RUN arch="$(uname -m)" && \
39
40
gh_url() { printf -- "${GH_BASE_URL}/%s/releases/download/%s/%s\n " "$@" ; } && \
40
- URL="$(gh_url dmikusa/tiny-health-checker v${THC_VERSION} thc-${arch}-unknown-linux-musl)" && \
41
- curl -fsSL --output /thc "${URL}" && chmod -v 00555 /thc
41
+ URL="$(gh_url dmikusa/tiny-health-checker v${THC_VERSION} tiny-health-checker-${arch}-unknown-linux-musl.tar.xz)" && \
42
+ curl -fsSL --output /tiny-health-checker-${arch}-unknown-linux-musl.tar.xz "${URL}" && \
43
+ tar -xvf /tiny-health-checker-${arch}-unknown-linux-musl.tar.xz && \
44
+ mv /tiny-health-checker-${arch}-unknown-linux-musl/thc /thc && \
45
+ chmod -v 00555 /thc
42
46
43
47
# Cache the thc binary as a layer
44
48
FROM scratch AS thc-bin
@@ -117,13 +121,13 @@ WORKDIR /app
117
121
118
122
COPY --from=builder /app/invidious_companion ./
119
123
120
- ARG HOST PORT THC_VERSION TINI_VERSION
124
+ ARG HOST PORT THC_VERSION THC_PORT_NAME TINI_VERSION
121
125
EXPOSE "${PORT}/tcp"
122
126
123
127
ENV SERVER_BASE_PATH=/companion \
124
128
HOST="${HOST}" \
125
129
PORT="${PORT}" \
126
- THC_PORT ="${PORT }" \
130
+ THC_PORT_NAME ="${THC_PORT_NAME }" \
127
131
THC_PATH="/healthz" \
128
132
THC_VERSION="${THC_VERSION}" \
129
133
TINI_VERSION="${TINI_VERSION}"
0 commit comments