Merge branch 'pre-prod' of https://gitea.woutervermeer.com/Quatsh/Quatsh-Website into pre-prod
All checks were successful
Gitea Test. / tests (push) Successful in 13s
All checks were successful
Gitea Test. / tests (push) Successful in 13s
This commit is contained in:
@@ -1,8 +1,11 @@
|
|||||||
|
#NGINX
|
||||||
|
NGINX_HOSTNAME=localhost
|
||||||
|
|
||||||
# Django
|
# Django
|
||||||
DJANGO_SETTINGS_MODULE=website.settings
|
DJANGO_SETTINGS_MODULE=website.settings
|
||||||
DJANGO_SECRET_KEY=CWHZCAZBNV57tDkwGHJwTUu3PCSnGG45
|
DJANGO_SECRET_KEY=CWHZCAZBNV57tDkwGHJwTUu3PCSnGG45
|
||||||
DEBUG=TRUE
|
DEBUG=TRUE
|
||||||
ALLOWED_HOSTS=localhost
|
#ALLOWED_HOSTS=localhost
|
||||||
|
|
||||||
# Database (PostgreSQL)
|
# Database (PostgreSQL)
|
||||||
POSTGRES_USER=test_user
|
POSTGRES_USER=test_user
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ run-name: ${{ gitea.actor }}
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- pre-prod
|
|
||||||
- main
|
- main
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
|
|||||||
17
.gitea/workflows/test.yaml
Normal file
17
.gitea/workflows/test.yaml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
name: Gitea Test.
|
||||||
|
run-name: ${{ gitea.actor }}
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- pre-prod
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
tests:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: test
|
||||||
|
run: make test
|
||||||
2
Makefile
2
Makefile
@@ -1,6 +1,6 @@
|
|||||||
prod:
|
prod:
|
||||||
docker compose down
|
docker compose down
|
||||||
docker compose -f ./compose.yaml -f ./.docker-compose-files/compose.prod.yaml up -d --build
|
docker compose --env-file .env -f ./compose.yaml -f ./.docker-compose-files/compose.prod.yaml up -d --build
|
||||||
docker exec quatsh-website-web-1 python manage.py collectstatic --noinput
|
docker exec quatsh-website-web-1 python manage.py collectstatic --noinput
|
||||||
docker exec quatsh-website-web-1 python manage.py check --deploy
|
docker exec quatsh-website-web-1 python manage.py check --deploy
|
||||||
docker exec quatsh-website-web-1 python manage.py migrate
|
docker exec quatsh-website-web-1 python manage.py migrate
|
||||||
|
|||||||
Reference in New Issue
Block a user