Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move docker files from development to production

Roland Geider178ca65ee634
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1478edab1..36fa90815 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -21,6 +21,6 @@ updates:
interval: "daily"
- package-ecosystem: "docker"
- directory: "/extras/docker/development/"
+ directory: "/extras/docker/production/"
schedule:
interval: "daily"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a69699025..c7aac378e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -72,7 +72,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
- file: extras/docker/development/Dockerfile
+ file: extras/docker/production/Dockerfile
builder: ${{ steps.buildx.outputs.name }}
platforms: ${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }}
diff --git a/extras/docker/development/settings.py b/extras/docker/development/settings.py
deleted file mode 100644
index 6f005e2ea..000000000
--- a/extras/docker/development/settings.py
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/env python
-
-# Third Party
-import environ
-
-# wger
-from wger.settings_global import *
-
-env = environ.Env(
- # set casting, default value
- DJANGO_DEBUG=(bool, False)
-)
-
-# Use 'DEBUG = True' to get more details for server errors
-DEBUG = env("DJANGO_DEBUG")
-
-if os.environ.get('DJANGO_ADMINS'):
- ADMINS = [env.tuple('DJANGO_ADMINS'), ]
- MANAGERS = ADMINS
-
-if os.environ.get("DJANGO_DB_ENGINE"):
- DATABASES = {
- 'default': {
- 'ENGINE': env.str("DJANGO_DB_ENGINE"),
- 'NAME': env.str("DJANGO_DB_DATABASE"),
- 'USER': env.str("DJANGO_DB_USER"),
- 'PASSWORD': env.str("DJANGO_DB_PASSWORD"),
- 'HOST': env.str("DJANGO_DB_HOST"),
- 'PORT': env.int("DJANGO_DB_PORT"),
- }
- }
-else:
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': env.str('DJANGO_DB_DATABASE', '/home/wger/db/database.sqlite'),
- }
- }
-
-# Timezone for this installation. Consult settings_global.py for more information
-TIME_ZONE = env.str("TIME_ZONE", 'Europe/Berlin')
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = env.str("SECRET_KEY", 'wger-docker-supersecret-key-1234567890!@#$%^&*(-_)')
-
-# Your reCaptcha keys
-RECAPTCHA_PUBLIC_KEY = env.str('RECAPTCHA_PUBLIC_KEY', '')
-RECAPTCHA_PRIVATE_KEY = env.str('RECAPTCHA_PRIVATE_KEY', '')
-
-# The site's URL (e.g. http://www.my-local-gym.com or http://localhost:8000)
-# This is needed for uploaded files and images (exercise images, etc.) to be
-# properly served.
-SITE_URL = env.str('SITE_URL', 'http://localhost:8000')
-
-# Path to uploaded files
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-MEDIA_ROOT = env.str("DJANGO_MEDIA_ROOT", '/home/wger/media')
-STATIC_ROOT = env.str("DJANGO_STATIC_ROOT", '/home/wger/static')
-
-# If you change these, adjust nginx alias definitions as well
-MEDIA_URL = env.str('MEDIA_URL', '/media/')
-STATIC_URL = env.str('STATIC_URL', '/static/')
-
-LOGIN_REDIRECT_URL = env.str('LOGIN_REDIRECT_URL', '/')
-
-# Allow all hosts to access the application. Change if used in production.
-ALLOWED_HOSTS = ['*', ]
-
-SESSION_ENGINE = "django.contrib.sessions.backends.cache"
-
-# Configure a real backend in production
-if DEBUG:
- EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-if env.bool("ENABLE_EMAIL", False):
- EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
- EMAIL_HOST = env.str("EMAIL_HOST")
- EMAIL_PORT = env.int("EMAIL_PORT")
- EMAIL_HOST_USER = env.str("EMAIL_HOST_USER")
- EMAIL_HOST_PASSWORD = env.str("EMAIL_HOST_PASSWORD")
- EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", True)
- EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
- EMAIL_TIMEOUT = 60
-
-# Sender address used for sent emails
-DEFAULT_FROM_EMAIL = env.str("FROM_EMAIL", "wger Workout Manager <[email protected]>")
-WGER_SETTINGS['EMAIL_FROM'] = DEFAULT_FROM_EMAIL
-SERVER_EMAIL = DEFAULT_FROM_EMAIL
-EMAIL_FROM_ADDRESS = DEFAULT_FROM_EMAIL
-
-# Management
-WGER_SETTINGS["ALLOW_GUEST_USERS"] = env.bool("ALLOW_GUEST_USERS", True)
-WGER_SETTINGS["ALLOW_REGISTRATION"] = env.bool("ALLOW_REGISTRATION", True)
-WGER_SETTINGS["ALLOW_UPLOAD_VIDEOS"] = env.bool("ALLOW_UPLOAD_VIDEOS", True)
-WGER_SETTINGS["DOWNLOAD_INGREDIENTS_FROM"] = env.str("DOWNLOAD_INGREDIENTS_FROM", "WGER")
-WGER_SETTINGS["EXERCISE_CACHE_TTL"] = env.int("EXERCISE_CACHE_TTL", 3600)
-WGER_SETTINGS["MIN_ACCOUNT_AGE_TO_TRUST"] = env.int("MIN_ACCOUNT_AGE_TO_TRUST", 21) # in days
-WGER_SETTINGS["SYNC_EXERCISES_CELERY"] = env.bool("SYNC_EXERCISES_CELERY", False)
-WGER_SETTINGS["SYNC_EXERCISE_IMAGES_CELERY"] = env.bool("SYNC_EXERCISE_IMAGES_CELERY", False)
-WGER_SETTINGS["SYNC_EXERCISE_VIDEOS_CELERY"] = env.bool("SYNC_EXERCISE_VIDEOS_CELERY", False)
-WGER_SETTINGS["SYNC_INGREDIENTS_CELERY"] = env.bool("SYNC_INGREDIENTS_CELERY", False)
-WGER_SETTINGS["SYNC_OFF_DAILY_DELTA_CELERY"] = env.bool("SYNC_OFF_DAILY_DELTA_CELERY", False)
-WGER_SETTINGS["USE_RECAPTCHA"] = env.bool("USE_RECAPTCHA", False)
-WGER_SETTINGS["USE_CELERY"] = env.bool("USE_CELERY", False)
-
-# Cache
-if os.environ.get("DJANGO_CACHE_BACKEND"):
- CACHES = {
- 'default': {
- 'BACKEND': env.str("DJANGO_CACHE_BACKEND"),
- 'LOCATION': env.str("DJANGO_CACHE_LOCATION"),
- 'TIMEOUT': env.int("DJANGO_CACHE_TIMEOUT"),
- 'OPTIONS': {
- 'CLIENT_CLASS': env.str("DJANGO_CACHE_CLIENT_CLASS")
- }
- }
- }
-
- if os.environ.get('DJANGO_CACHE_CLIENT_PASSWORD'):
- CACHES['default']['OPTIONS']['PASSWORD'] = env.str('DJANGO_CACHE_CLIENT_PASSWORD')
-
- CONNECTION_POOL_KWARGS = dict()
- if "DJANGO_CACHE_CLIENT_SSL_KEYFILE" in os.environ:
- CONNECTION_POOL_KWARGS['ssl_keyfile'] = env.str("DJANGO_CACHE_CLIENT_SSL_KEYFILE")
-
- if "DJANGO_CACHE_CLIENT_SSL_CERTFILE" in os.environ:
- CONNECTION_POOL_KWARGS['ssl_certfile'] = env.str("DJANGO_CACHE_CLIENT_SSL_CERTFILE")
-
- if "DJANGO_CACHE_CLIENT_SSL_CERT_REQS" in os.environ:
- CONNECTION_POOL_KWARGS['ssl_cert_reqs'] = env.str("DJANGO_CACHE_CLIENT_SSL_CERT_REQS")
-
- if "DJANGO_CACHE_CLIENT_SSL_CHECK_HOSTNAME" in os.environ:
- CONNECTION_POOL_KWARGS['ssl_check_hostname'] = env.bool(
- "DJANGO_CACHE_CLIENT_SSL_CHECK_HOSTNAME")
-
- if CONNECTION_POOL_KWARGS:
- CACHES["default"]["OPTIONS"]["CONNECTION_POOL_KWARGS"] = CONNECTION_POOL_KWARGS
-
-# Folder for compressed CSS and JS files
-COMPRESS_ROOT = STATIC_ROOT
-
-# The site's domain as used by the email verification workflow
-EMAIL_PAGE_DOMAIN = SITE_URL
-
-#
-# Django Axes
-#
-AXES_ENABLED = env.bool('AXES_ENABLED', True)
-AXES_LOCKOUT_PARAMETERS = env.list('AXES_LOCKOUT_PARAMETERS', default=['ip_address'])
-AXES_FAILURE_LIMIT = env.int('AXES_FAILURE_LIMIT', 10)
-AXES_COOLOFF_TIME = timedelta(minutes=env.float('AXES_COOLOFF_TIME', 30))
-AXES_HANDLER = env.str('AXES_HANDLER', 'axes.handlers.cache.AxesCacheHandler')
-AXES_IPWARE_PROXY_COUNT = env.int('AXES_IPWARE_PROXY_COUNT', 0)
-AXES_IPWARE_META_PRECEDENCE_ORDER = env.list('AXES_IPWARE_META_PRECEDENCE_ORDER',
- default=['REMOTE_ADDR'])
-
-#
-# Django Rest Framework SimpleJWT
-#
-SIMPLE_JWT['ACCESS_TOKEN_LIFETIME'] = timedelta(minutes=env.int("ACCESS_TOKEN_LIFETIME", 15))
-SIMPLE_JWT['REFRESH_TOKEN_LIFETIME'] = timedelta(hours=env.int("REFRESH_TOKEN_LIFETIME", 24))
-SIMPLE_JWT['SIGNING_KEY'] = env.str("SIGNING_KEY", SECRET_KEY)
-
-#
-# https://docs.djangoproject.com/en/4.1/ref/csrf/
-#
-CSRF_TRUSTED_ORIGINS = env.list(
- "CSRF_TRUSTED_ORIGINS",
- default=['http://127.0.0.1', 'http://localhost', 'https://localhost'],
-)
-
-if env.bool('X_FORWARDED_PROTO_HEADER_SET', False):
- SECURE_PROXY_SSL_HEADER = (
- env.str('SECURE_PROXY_SSL_HEADER', 'HTTP_X_FORWARDED_PROTO'),
- 'https'
- )
-
-REST_FRAMEWORK['NUM_PROXIES'] = env.int('NUMBER_OF_PROXIES', 1)
-
-#
-# Celery message queue configuration
-#
-CELERY_BROKER_URL = env.str("CELERY_BROKER", "redis://cache:6379/2")
-CELERY_RESULT_BACKEND = env.str("CELERY_BACKEND", "redis://cache:6379/2")
-
-#
-# Prometheus metrics
-#
-EXPOSE_PROMETHEUS_METRICS = env.bool('EXPOSE_PROMETHEUS_METRICS', False)
-PROMETHEUS_URL_PATH = env.str('PROMETHEUS_URL_PATH', 'super-secret-path')
diff --git a/extras/docker/development/Dockerfile b/extras/docker/production/Dockerfile
similarity index 94%
rename from extras/docker/development/Dockerfile
rename to extras/docker/production/Dockerfile
index 9055cb021..213e1702d 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/production/Dockerfile
@@ -4,7 +4,7 @@
# Please consult the README for usage
#
# Note: you MUST build this image from the project's root!
-# docker build -f extras/docker/development/Dockerfile --tag wger/server .
+# docker build -f extras/docker/production/Dockerfile --tag wger/server .
#
# To run the container consult https://github.com/wger-project/docker
@@ -50,7 +50,7 @@ RUN ln -s /usr/bin/yarnpkg /usr/bin/yarn \
########
FROM wger/base:latest
LABEL maintainer="Roland Geider <[email protected]>"
-ARG DOCKER_DIR=./extras/docker/development
+ARG DOCKER_DIR=./extras/docker/production
ENV PATH="/home/wger/.local/bin:$PATH"
EXPOSE 8000
diff --git a/extras/docker/development/README.md b/extras/docker/production/README.md
similarity index 92%
rename from extras/docker/development/README.md
rename to extras/docker/production/README.md
index aeb04db04..93b53b055 100644
--- a/extras/docker/development/README.md
+++ b/extras/docker/production/README.md
@@ -20,19 +20,22 @@ A more comfortable development version is provided in the compose folder.
### 1 - Installing docker
-Install docker, and the docker buildx tool (if they are separate packages on your system, e.g. on Arch Linux)
+Install docker, and the docker buildx tool (if they are separate packages on your system, e.g. on
+Arch Linux)
### 2 - Obtaining/building the docker image
We will run the `wger/server:latest` image in the next step.
-You can either download it from [dockerhub](https://hub.docker.com/r/wger/server); docker will do this automatically if you have no such image with that tag yet.
-You can also run `docker pull wger/server` to get the latest version. (you can use `docker images` to see if your image is old)
+You can either download it from [dockerhub](https://hub.docker.com/r/wger/server); docker will do
+this automatically if you have no such image with that tag yet.
+You can also run `docker pull wger/server` to get the latest version. (you can use `docker images`
+to see if your image is old)
Alternatively, you can build it yourself from your wger code checkout.
To do this, you **must** build from the project root!
-```docker build -f extras/docker/development/Dockerfile --tag wger/server .```
+```docker build -f extras/docker/production/Dockerfile --tag wger/server .```
### 3 - Start the container
diff --git a/extras/docker/development/celery/beat/start b/extras/docker/production/celery/beat/start
similarity index 100%
rename from extras/docker/development/celery/beat/start
rename to extras/docker/production/celery/beat/start
diff --git a/extras/docker/development/celery/flower/start b/extras/docker/production/celery/flower/start
similarity index 100%
rename from extras/docker/development/celery/flower/start
rename to extras/docker/production/celery/flower/start
diff --git a/extras/docker/development/celery/worker/start b/extras/docker/production/celery/worker/start
similarity index 100%
rename from extras/docker/development/celery/worker/start
rename to extras/docker/production/celery/worker/start
diff --git a/extras/docker/development/entrypoint.sh b/extras/docker/production/entrypoint.sh
similarity index 100%
rename from extras/docker/development/entrypoint.sh
rename to extras/docker/production/entrypoint.sh