Skip to content

Commit d5a180e

Browse files
author
lijianguo
committed
Merge branch 'main' of github.com:drycc/helmbroker into main
2 parents e4170ef + 026b529 commit d5a180e

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

rootfs/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN apk add --update --virtual .build-deps \
1212
musl-dev \
1313
openssl-dev \
1414
&& python3 -m venv /app/.venv \
15+
&& source /app/.venv/bin/activate \
1516
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
1617
&& runDeps="$( \
1718
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -30,5 +31,7 @@ RUN apk add --update --virtual .build-deps \
3031
&& chmod +x /app/bin/* \
3132
&& /app/bin/install
3233

34+
ENTRYPOINT ["/app/bin/entrypoint"]
35+
3336
CMD ["/app/bin/boot"]
3437
EXPOSE 8000

rootfs/Dockerfile.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN apk add --update --virtual .build-deps \
1212
musl-dev \
1313
openssl-dev \
1414
&& python3 -m venv /app/.venv \
15+
&& source /app/.venv/bin/activate \
1516
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
1617
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/dev_requirements.txt \
1718
&& runDeps="$( \
@@ -33,5 +34,7 @@ RUN apk add --update --virtual .build-deps \
3334
&& /app/bin/install
3435
COPY . /app
3536

37+
ENTRYPOINT ["/app/bin/entrypoint"]
38+
3639
CMD ["/app/bin/boot"]
3740
EXPOSE 8000

rootfs/bin/entrypoint

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
# shellcheck disable=SC1090,SC1091
3+
4+
set -e
5+
source /app/.venv/bin/activate
6+
exec "$@"

0 commit comments

Comments
 (0)