michael/merlyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dockerfile cleanup; enforce text LF line endings (#81)

Browse Source
This commit is contained in:
frasergr 2023-06-17 20:18:01 -07:00 committed by GitHub
parent 3945a77290
commit 4079020de0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
* text=auto eol=lf

8
docker/Dockerfile
View File

@ -34,12 +34,10 @@ RUN groupadd -g $ARG_GID anythingllm && \
# Copy docker helper scripts # Copy docker helper scripts
COPY ./docker/docker-entrypoint.sh /usr/local/bin/ COPY ./docker/docker-entrypoint.sh /usr/local/bin/
COPY ./docker/docker-healthcheck.sh /usr/local/bin/ COPY ./docker/docker-healthcheck.sh /usr/local/bin/
COPY ./docker/dual_boot.sh /usr/local/bin/
# Ensure the scripts are executable # Ensure the scripts are executable
RUN chmod +x /usr/local/bin/docker-entrypoint.sh && \ RUN chmod +x /usr/local/bin/docker-entrypoint.sh && \
chmod +x /usr/local/bin/docker-healthcheck.sh && \ chmod +x /usr/local/bin/docker-healthcheck.sh
chmod 777 /usr/local/bin/dual_boot.sh
USER anythingllm USER anythingllm
@ -91,6 +89,4 @@ HEALTHCHECK --interval=1m --timeout=10s --start-period=1m \
CMD /bin/bash /usr/local/bin/docker-healthcheck.sh || exit 1 CMD /bin/bash /usr/local/bin/docker-healthcheck.sh || exit 1
# Run the server # Run the server
ENTRYPOINT ["docker-entrypoint.sh"] ENTRYPOINT ["/bin/bash", "/usr/local/bin/docker-entrypoint.sh"]
CMD /bin/bash /usr/local/bin/dual_boot.sh

8
docker/docker-entrypoint.sh
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash #!/bin/bash
node /app/server/index.js &
exec "$@" { FLASK_ENV=production FLASK_APP=wsgi.py cd collector && gunicorn --workers 4 --bind 0.0.0.0:8888 wsgi:api; } &
wait -n
exit $?

5
docker/dual_boot.sh
View File

@ -1,5 +0,0 @@
#!/bin/bash
node /app/server/index.js &
{ FLASK_ENV=production FLASK_APP=wsgi.py cd collector && gunicorn --workers 4 --bind 0.0.0.0:8888 wsgi:api; } &
wait -n
exit $?