Skip to content

Commit

Permalink
config: Remove unnecessary commands and update Django settings and ng…
Browse files Browse the repository at this point in the history
…inx configuration
  • Loading branch information
drikusroor committed Feb 7, 2024
1 parent 48ab2da commit 9adc4b8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/podman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,9 @@ jobs:
cp .env frontend/.env
- name: Build Podman images
run: podman-compose -f docker-compose-deploy.yml build
- name: Kill muscle client container
run: podman rm -f muscle_client-runner_1 || true
- name: Deploy Podman images
run: podman-compose -f docker-compose-deploy.yml up -d --force-recreate
- name: Check Podman images
run: podman-compose -f docker-compose-deploy.yml ps
- name: Check logs
run: podman-compose -f docker-compose-deploy.yml logs
- name: Check if static files are present in backend/static and backend/upload
run: |
ls -l /home/github-runner/podman-volumes/server-static
ls -l /home/github-runner/podman-volumes/server-uploads
run: podman-compose -f docker-compose-deploy.yml logs
5 changes: 5 additions & 0 deletions backend/aml/production_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
# Database
# https://docs.djangoproject.com/en/3.0/ref/settings/#databases

STATIC_ROOT = '/static/'
MEDIA_ROOT = '/upload/'

# Make sure Django runs on subpath /server
FORCE_SCRIPT_NAME = '/server/'

DATABASES = {
'default': {
Expand Down
5 changes: 0 additions & 5 deletions nginx/custom-nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ server {
alias /nginx/upload/;
}

# Serve files from /test-path/ from the /nginx/static/ directory
location /test-path/ {
alias /nginx/static/;
}

# Proxy other /server/* requests to the Django app that runs on http://localhost:8000
location /server/ {
proxy_pass http://localhost:8000;
Expand Down

0 comments on commit 9adc4b8

Please sign in to comment.