Skip to content

Commit

Permalink
Merge pull request #3 from maykinmedia/default-project
Browse files Browse the repository at this point in the history
Default project
  • Loading branch information
Floris272 authored Aug 6, 2024
2 parents 8cfdfc9 + 52a1065 commit 0a3e07b
Show file tree
Hide file tree
Showing 24 changed files with 1,271 additions and 630 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
# Needed because the postgres container does not provide a healthcheck
options:
--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
--name postgres
redis:
image: redis:6
ports:
Expand All @@ -43,7 +44,7 @@ jobs:
python-version: '3.11'
optimize-postgres: 'yes'
pg-service: 'postgres'
setup-node: 'yes'
setup-node: 'no'
# apt-packages: 'gettext postgresql-client' # the default
# npm-ci-flags: '--legacy-peer-deps' -> preferably use a .npmrc file

Expand Down
36 changes: 0 additions & 36 deletions .github/workflows/macos.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ COPY --from=backend-build /usr/local/bin/uwsgi /usr/local/bin/uwsgi
COPY --from=backend-build /app/src/ /app/src/

# copy frontend build statics
COPY --from=frontend-build /app/src/open_producten/static /app/src/open_producten/static
# COPY --from=frontend-build /app/src/open_producten/static /app/src/open_producten/static

# copy source code
COPY ./src /app/src
Expand Down
8 changes: 4 additions & 4 deletions docker-init-db.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE USER {{ project_name|lower }};
CREATE DATABASE {{ project_name|lower }};
GRANT ALL PRIVILEGES ON DATABASE {{ project_name|lower }} TO {{ project_name|lower }};
CREATE USER open_producten;
CREATE DATABASE open_producten;
GRANT ALL PRIVILEGES ON DATABASE open_producten TO open_producten;
-- On Postgres 15+, connect to the database and grant schema permissions.
-- GRANT USAGE, CREATE ON SCHEMA public TO openforms;
-- GRANT USAGE, CREATE ON SCHEMA public TO openforms;
21 changes: 4 additions & 17 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
# Core python libraries
Pillow # handle images
psycopg2 # database driver
python-dotenv # environment variables for secrets
python-decouple # processing of envvar configs

open-api-framework

# Framework libraries
django ~= 4.2
django-admin-index
django-axes
django-hijack
django-redis
django-rosetta
maykin-2fa
# django-hijack
# django-rosetta

# API libraries
# djangorestframework
# django-extra-fields
# django-filter
# drf-yasg # api documentation

# WSGI servers & monitoring - production oriented
uwsgi
sentry-sdk # error monitoring
elastic-apm # Elastic APM integration
Loading

0 comments on commit 0a3e07b

Please sign in to comment.