Skip to content

Commit 9efd0c3

Browse files
authored
Merge pull request #45 from nextcloud/feat/start.sh
feat: easier HaRP adopt - modified start.sh to accept an entrypoint arg
2 parents 50b9755 + 58519e2 commit 9efd0c3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Diff for: Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ COPY --chmod=775 start.sh /
5353

5454
# Set working directory and define entrypoint/healthcheck.
5555
WORKDIR /ex_app/lib
56-
ENTRYPOINT ["/start.sh"]
56+
ENTRYPOINT ["/start.sh", "python3", "main.py"]
5757
HEALTHCHECK --interval=2s --timeout=2s --retries=300 CMD /healthcheck.sh

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ help:
3030

3131
.PHONY: build-push
3232
build-push:
33-
docker login ghcr.io
33+
# docker login ghcr.io
3434
DOCKER_BUILDKIT=1 docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/nextcloud/app-skeleton-python:latest .
3535

3636
.PHONY: run30

Diff for: start.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ if [ -f /frpc.toml ] && [ -n "$HP_SHARED_KEY" ]; then
6060
frpc -c /frpc.toml &
6161
fi
6262

63-
# Start the main application (adjust it for your ExApp)
64-
echo "Starting main application..."
65-
exec python3 main.py
63+
# Start the main application (launch cmd for ExApp is an argument for this script)
64+
echo "Starting application: $@"
65+
exec "$@"

0 commit comments

Comments
 (0)