Skip to content

Commit

Permalink
Merge pull request #1015 from yuvipanda/local-dev
Browse files Browse the repository at this point in the history
Set development env vars in dev documentation correctly
  • Loading branch information
minrk authored Dec 10, 2024
2 parents 947eb02 + 53eceab commit 4b06676
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
3 changes: 3 additions & 0 deletions docs/contributing/dev-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ The easiest & safest way to develop & test TLJH is with [Docker](https://www.doc
--detach \
--name=tljh-dev \
--publish 12000:80 \
--env TLJH_BOOTSTRAP_DEV=yes \
--env TLJH_BOOTSTRAP_PIP_SPEC=/srv/src \
--env PATH=/opt/tljh/hub/bin:${PATH} \
--mount type=bind,source="$(pwd)",target=/srv/src \
tljh-systemd
```
Expand Down
7 changes: 1 addition & 6 deletions integration-tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Systemd inside a Docker container, for CI only
# Systemd inside a Docker container, for CI and local development
ARG BASE_IMAGE=ubuntu:22.04
FROM $BASE_IMAGE

Expand Down Expand Up @@ -28,9 +28,4 @@ RUN systemctl set-default multi-user.target

STOPSIGNAL SIGRTMIN+3

# Uncomment these lines for a development install
# ENV TLJH_BOOTSTRAP_DEV=yes
# ENV TLJH_BOOTSTRAP_PIP_SPEC=/srv/src
# ENV PATH=/opt/tljh/hub/bin:${PATH}

CMD ["/bin/bash", "-c", "exec /lib/systemd/systemd --log-target=journal 3>&1"]

0 comments on commit 4b06676

Please sign in to comment.