Skip to content

Commit

Permalink
Merge branch 'main' into additional-statistical-parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasmllr authored Mar 19, 2024
2 parents d951bf5 + b7118b2 commit 21a70da
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ jobs:
defaults:
run:
working-directory: frontend
env:
DEBUG: "False"
ALLOWED_HOSTS: 'localhost,'
CSRF_TRUSTED_ORIGINS: 'http://localhost,https://localhost'
SECRET_KEY: 'temporary_debug_key'
timeout-minutes: 15
steps:
- name: Checkout code
Expand All @@ -70,10 +75,9 @@ jobs:
python-version: "3.12"
- name: Install requirements
run: |
pip install -r ./frontend/requirements.txt
pip install -r requirements.txt
- name: Run tests
run: |
cd frontend
python manage.py test
results:
Expand Down
10 changes: 5 additions & 5 deletions frontend/Dockerfile.nginx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV PYTHONUNBUFFERED 1
ENV PATH="/venv/bin:$PATH"

RUN apt-get update --no-install-recommends && \
apt-get install -y gcc
apt-get install -y gcc
RUN python -m venv /venv

# install requirements
Expand All @@ -32,10 +32,10 @@ COPY --from=BUILDER /app/nginx.conf /app/nginx.conf
COPY start_nginx.sh /app/start_nginx.sh
## add permissions for nginx user
RUN chown -R nginx:nginx /app && chmod -R 777 /app && \
chown -R nginx:nginx /var/cache/nginx && chmod -R 777 /var/cache/nginx && \
chown -R nginx:nginx /var/log/nginx && chmod -R 777 /var/log/nginx && \
chown -R nginx:nginx /etc/nginx/conf.d && chmod -R 777 /etc/nginx/conf.d && \
chown -R nginx:nginx /etc/nginx/nginx.conf && chmod -R 777 /etc/nginx/nginx.conf
chown -R nginx:nginx /var/cache/nginx && chmod -R 777 /var/cache/nginx && \
chown -R nginx:nginx /var/log/nginx && chmod -R 777 /var/log/nginx && \
chown -R nginx:nginx /etc/nginx/conf.d && chmod -R 777 /etc/nginx/conf.d && \
chown -R nginx:nginx /etc/nginx/nginx.conf && chmod -R 777 /etc/nginx/nginx.conf
RUN touch /var/run/nginx.pid && \
chown -R nginx:nginx /var/run/nginx.pid && chmod -R 777 /var/run/nginx.pid

Expand Down

0 comments on commit 21a70da

Please sign in to comment.