-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into css-minimizer
- Loading branch information
Showing
5 changed files
with
5 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
[submodule "thunor"] | ||
path = thunor | ||
path = thunorcore | ||
url = https://github.com/alubbock/thunor.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
FROM python:3.12-slim-bullseye AS thunorweb_base | ||
LABEL org.opencontainers.image.authors="[email protected]" | ||
ENV PYTHONUNBUFFERED 1 | ||
ENV PYTHONUNBUFFERED=1 | ||
ENV THUNOR_HOME=/thunor | ||
|
||
RUN apt update && apt install -y libpq-dev gcc libmagic1 libpcre3-dev media-types \ | ||
|
@@ -10,13 +10,12 @@ RUN mkdir $THUNOR_HOME | |
WORKDIR $THUNOR_HOME | ||
|
||
ADD requirements.txt $THUNOR_HOME | ||
ADD thunor $THUNOR_HOME/thunor | ||
ADD thunorcore $THUNOR_HOME/thunorcore | ||
RUN pip3 install --no-cache-dir -r requirements.txt | ||
RUN dpkg --purge gcc libpcre3-dev | ||
CMD ["uwsgi", "--master", "--socket", ":8000", "--module", "thunordjango.wsgi", "--uid", "www-data", "--gid", "www-data", "--enable-threads"] | ||
ADD manage.py $THUNOR_HOME | ||
ADD thunordjango $THUNOR_HOME/thunordjango | ||
RUN cd $THUNOR_HOME/thunor && python3 setup.py install | ||
ADD thunorweb $THUNOR_HOME/thunorweb | ||
ARG THUNORWEB_VERSION=unknown | ||
RUN printf "def get_versions():\n return {'version': '$THUNORWEB_VERSION'}\n" > $THUNOR_HOME/thunorweb/_version.py | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
-e ./thunor[test] | ||
-e ./thunorcore[test] | ||
numpy==2.1.1 | ||
pandas==2.2.2 | ||
plotly==5.24.0 | ||
|
Submodule thunor
deleted from
933354
Submodule thunorcore
added at
98c536