Skip to content

Commit 638773b

Browse files
committed
chore(helmbroker): change workdir to /workspace
1 parent 0ffdcfa commit 638773b

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

rootfs/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ FROM docker.io/drycc/base:bullseye
33
RUN adduser --system \
44
--shell /bin/bash \
55
--disabled-password \
6-
--home /app \
6+
--home /workspace \
77
--group \
88
drycc
99

1010
ENV PYTHON_VERSION="3.10.2" \
1111
HELM_VERSION="3.8.0"
1212

13-
COPY . /app
13+
COPY . /workspace
1414

15-
WORKDIR /app
15+
WORKDIR /workspace
1616
RUN buildDeps='musl-dev openssl' \
1717
&& install-packages $buildDeps \
1818
&& install-stack python $PYTHON_VERSION \
1919
&& install-stack helm $HELM_VERSION && . init-stack \
20-
&& python3 -m venv /app/.venv \
21-
&& source /app/.venv/bin/activate \
22-
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
23-
&& chown -R drycc:drycc /app \
20+
&& python3 -m venv /workspace/.venv \
21+
&& source /workspace/.venv/bin/activate \
22+
&& pip3 install --disable-pip-version-check --no-cache-dir -r /workspace/requirements.txt \
23+
&& chown -R drycc:drycc /workspace \
2424
# set env
25-
&& echo "source /app/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
25+
&& echo "source /workspace/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
2626
# cleanup
27-
&& scanelp /app/.venv/lib > runtime.txt \
27+
&& scanelp /workspace/.venv/lib > runtime.txt \
2828
&& apt-get purge -y --auto-remove $buildDeps \
2929
&& install-packages $(< runtime.txt) \
3030
&& apt-get autoremove -y \
@@ -45,6 +45,6 @@ RUN buildDeps='musl-dev openssl' \
4545
&& mkdir -p /usr/share/man/man{1..8}
4646

4747
USER drycc
48-
WORKDIR /app
49-
CMD ["/app/bin/boot"]
48+
WORKDIR /workspace
49+
CMD ["/workspace/bin/boot"]
5050
EXPOSE 8000

rootfs/Dockerfile.test

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ FROM docker.io/drycc/base:bullseye
33
RUN adduser --system \
44
--shell /bin/bash \
55
--disabled-password \
6-
--home /app \
6+
--home /workspace \
77
--group \
88
drycc
99

1010
ENV PYTHON_VERSION="3.10.2" \
1111
HELM_VERSION="3.8.0" \
1212
KUBECTL_VERSION="1.23.4"
1313

14-
COPY . /app
15-
WORKDIR /app
14+
COPY . /workspace
15+
WORKDIR /workspace
1616

1717
RUN buildDeps='musl-dev openssl'; \
1818
install-packages $buildDeps \
1919
&& install-stack python $PYTHON_VERSION \
2020
&& install-stack helm $HELM_VERSION \
2121
&& install-stack kubectl $KUBECTL_VERSION && . init-stack \
22-
&& python3 -m venv /app/.venv \
23-
&& source /app/.venv/bin/activate \
24-
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
25-
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/dev_requirements.txt \
26-
&& chown -R drycc:drycc /app \
22+
&& python3 -m venv /workspace/.venv \
23+
&& source /workspace/.venv/bin/activate \
24+
&& pip3 install --disable-pip-version-check --no-cache-dir -r /workspace/requirements.txt \
25+
&& pip3 install --disable-pip-version-check --no-cache-dir -r /workspace/dev_requirements.txt \
26+
&& chown -R drycc:drycc /workspace \
2727
# set env
28-
&& echo "source /app/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
28+
&& echo "source /workspace/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
2929
# cleanup
30-
&& scanelp /app/.venv/lib > runtime.txt \
30+
&& scanelp /workspace/.venv/lib > runtime.txt \
3131
&& apt-get purge -y --auto-remove $buildDeps \
3232
&& install-packages $(< runtime.txt) \
3333
&& apt-get autoremove -y \
@@ -48,6 +48,6 @@ RUN buildDeps='musl-dev openssl'; \
4848
&& mkdir -p /usr/share/man/man{1..8} \
4949

5050
USER drycc
51-
WORKDIR /app
52-
CMD ["/app/bin/boot"]
51+
WORKDIR /workspace
52+
CMD ["/workspace/bin/boot"]
5353
EXPOSE 8000

rootfs/bin/boot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -eo pipefail
88
# spawn a gunicorn server in the background
99
echo ""
1010
echo "Starting up Gunicorn"
11-
gunicorn -c /app/helmbroker/gunicorn/config.py helmbroker.wsgi &
11+
gunicorn -c /workspace/helmbroker/gunicorn/config.py helmbroker.wsgi &
1212

1313
# smart shutdown on SIGTERM (SIGINT is handled by gunicorn)
1414
function on_exit() {

0 commit comments

Comments
 (0)