Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/.vagrant
*.pyc
/storage/
storage/
venv/
data/
.idea
Expand All @@ -10,11 +9,15 @@ data/
exodus/django
exodus/celerybeat-schedule
celerybeat.pid
scheduler.sh

# Settings files
.env
exodus/exodus/settings/custom_dev.py
exodus/exodus/settings/custom_docker.py
exodus/exodus/settings/production.py
staticfiles

# Static files
exodus/staticfiles

# Translations
*.mo
2 changes: 1 addition & 1 deletion doc/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ You have different ways of setting up your development environment:

- [Docker](#docker-setup)
- [Manual](#manual-setup)
- ~~Vagrant (Deprecated)~~

### Docker setup

Expand Down Expand Up @@ -72,6 +71,7 @@ docker-compose exec exodus-worker /entrypoint.sh "<command>"

to make actions, where `<command>` can be:

- `collect-static`: Collect all static files
- `compile-messages`: Compile the translation messages
- `create-db`: Create the database and apply migrations
- `create-user`: Create a Django user
Expand Down
3 changes: 2 additions & 1 deletion docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ declare -r pymanage="$pyexe manage.py"
declare -r custom_docker_settings="/exodus/exodus/exodus/settings/custom_docker.py"

declare -Ar commandList=(
[collect-static]=collectStatic
[compile-messages]=compileMessages
[create-db]=createDB
[create-user]=createUser
Expand All @@ -18,6 +19,7 @@ declare -Ar commandList=(
)

declare -Ar commandHelpList=(
[collect-static]='collect all static files'
[compile-messages]='compile translation messages'
[create-db]='create database if required and attend to migrations'
[create-user]='actually create a super user if not created yet'
Expand Down Expand Up @@ -134,7 +136,6 @@ function init_db() {

function init() {
init_db
collectStatic
compileMessages
startFrontend
}
Expand Down
2 changes: 1 addition & 1 deletion exodus/exodus/settings/common_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ALLOWED_HOSTS = ['*']

STATIC_URL = '/static/'
STATIC_ROOT = f'{BASE_DIR}/static/'
STATIC_ROOT = f'{ROOT_DIR}/staticfiles/'
STATICFILES_DIRS = [f'{APPS_DIR}/static']

MINIO_STORAGE_ACCESS_KEY = env('EXODUS_MINIO_ROOT_USER', default='exodusexodus')
Expand Down
2 changes: 1 addition & 1 deletion exodus/exodus/settings/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
}

STATIC_ROOT = f'{BASE_DIR}/staticfiles/'
STATIC_ROOT = f'{ROOT_DIR}/staticfiles/'
CELERY_BROKER_URL = 'amqp://guest@amqp//'
BROKER_URL = CELERY_BROKER_URL
MINIO_STORAGE_ENDPOINT = 'minio:9000'
275 changes: 0 additions & 275 deletions exodus/static/admin/css/autocomplete.css

This file was deleted.

Loading
Loading