Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update docker compose file (WIP)

Roland Geiderd005a1678d97
diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfile
index 14671e7d9..60b9cc6c2 100644
--- a/extras/docker/base/Dockerfile
+++ b/extras/docker/base/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update \
vim \
tmux \
sqlite3 \
+ netcat-openbsd \
&& rm -rf /var/lib/apt/lists/*
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index 2b1e6e785..ef449317b 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
# Build the necessary python wheels
COPY requirements* ./
-RUN pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_devel.txt
+RUN pip3 wheel --no-cache-dir --wheel-dir /wheels -r requirements_devel.txt
@@ -44,6 +44,7 @@ RUN pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_de
########
FROM wger/base:2.0-dev
LABEL maintainer="Roland Geider <[email protected]>"
+ARG DOCKER_DIR=./extras/docker/development
EXPOSE 8000
# Set locale to UTF8, otherwise problems with the encoding can occur, e.g.
@@ -53,27 +54,27 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
# Set up the application
-COPY --chown=wger:wger . /home/wger/src
-COPY --from=builder /usr/src/app/wheels /wheels
WORKDIR /home/wger/src
+COPY --chown=wger:wger . /home/wger/src
+COPY --from=builder /wheels /wheels
+COPY ${DOCKER_DIR}/settings.py /home/wger/src
+COPY ${DOCKER_DIR}/entrypoint.sh /home/wger/entrypoint.sh
+RUN chmod +x /home/wger/entrypoint.sh
RUN pip3 install --no-cache /wheels/* \
+ && pip3 install psycopg2-binary \
+ && pip3 install python-memcached \
&& python3 setup.py develop \
&& npm install \
&& npm install bower
+RUN chown -R wger:wger .
USER wger
-WORKDIR /home/wger/src
-RUN wger create_settings \
- --settings-path /home/wger/src/settings.py \
- --database-path /home/wger/db/database.sqlite \
- && wger bootstrap \
- --settings-path /home/wger/src/settings.py \
- --no-start-server
-
-# Download the exercise images
-RUN mkdir ~/media \
- && sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py
+RUN mkdir ~/media
+RUN mkdir ~/db/
-CMD ["/bin/bash"]
+CMD ["/home/wger/entrypoint.sh"]
diff --git a/extras/docker/development/entrypoint.sh b/extras/docker/development/entrypoint.sh
new file mode 100644
index 000000000..92532ebc7
--- /dev/null
+++ b/extras/docker/development/entrypoint.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+cd /home/wger/src
+
+if [[ "$DJANGO_DB_PORT" == "5432" ]]; then
+ echo "Waiting for postgres..."
+
+ while ! nc -z $DJANGO_DB_HOST $DJANGO_DB_PORT; do
+ sleep 0.1
+ done
+
+ echo "PostgreSQL started :)"
+fi
+
+if [[ "$WGER_BOOTSTRAP" == "TRUE" ]];
+then
+ wger bootstrap \
+ --settings-path /home/wger/src/settings.py \
+ --no-start-server
+fi
+
+if [[ "$WGER_DOWNLOAD_IMGS" == "TRUE" ]];
+then
+ wger download-exercise-images
+ chmod -R g+w ~wger/media
+fi
+
+#exec "$@"
+python3 manage.py runserver 0.0.0.0:8000
diff --git a/extras/docker/production/README b/extras/docker/docker-compose/README
similarity index 100%
rename from extras/docker/production/README
rename to extras/docker/docker-compose/README
diff --git a/extras/docker/docker-compose/dev.env b/extras/docker/docker-compose/dev.env
new file mode 100644
index 000000000..8b1292a9b
--- /dev/null
+++ b/extras/docker/docker-compose/dev.env
@@ -0,0 +1,18 @@
+
+# Database
+DJANGO_DB_ENGINE=django.db.backends.postgresql
+DJANGO_DB_DATABASE=wger
+DJANGO_DB_USER=wger
+DJANGO_DB_PASSWORD=wger
+DJANGO_DB_HOST=db
+DJANGO_DB_PORT=5432
+
+# Cache
+DJANGO_CACHE_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+DJANGO_CACHE_HOST=cache
+DJANGO_CACHE_PORT=11211
+DJANGO_CACHE_TIMEOUT=100
+
+DJANGO_MEDIA_ROOT=/home/wger/media
+
+WGER_BOOTSTRAP=TRUE
diff --git a/extras/docker/docker-compose/docker-compose.yml b/extras/docker/docker-compose/docker-compose.yml
new file mode 100644
index 000000000..744bdb56f
--- /dev/null
+++ b/extras/docker/docker-compose/docker-compose.yml
@@ -0,0 +1,36 @@
+version: '3.7'
+
+services:
+ web:
+ image: wger/devel-tmp
+ #build:
+ # context: ../../../
+ # dockerfile: ./extras/docker/development/Dockerfile
+ #command: python3 manage.py runserver 0.0.0.0:8000
+ #volumes:
+ # - type: bind
+ # source: ../../../
+ # target: /home/wger/src/
+ ports:
+ - 8000:8000
+ env_file:
+ - ./dev.env
+ depends_on:
+ - db
+ - cache
+ db:
+ image: postgres:12.0-alpine
+ volumes:
+ - type: bind
+ source: ./wger-postgres-data
+ target: /var/lib/postgresql/data/
+ environment:
+ - POSTGRES_USER=wger
+ - POSTGRES_PASSWORD=wger
+ - POSTGRES_DB=wger
+
+ cache:
+ image: memcached
+
+volumes:
+ postgres_data:
diff --git a/extras/docker/production/env b/extras/docker/docker-compose/env
similarity index 100%
rename from extras/docker/production/env
rename to extras/docker/docker-compose/env
diff --git a/extras/docker/production/application/Dockerfile b/extras/docker/production/application/Dockerfile
deleted file mode 100644
index e34919e53..000000000
--- a/extras/docker/production/application/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Docker image for wger development
-#
-# Please consult the documentation for usage
-# docker build -t wger/devel .
-# docker run -ti --name wger.devel --publish 8000:8000 wger/devel
-# (in docker) source ~/venv/bin/activate
-# (in docker) python manage.py runserver 0.0.0.0:8000
-#
-#
-
-
-FROM wger/base
-
-MAINTAINER Roland Geider <[email protected]>
-EXPOSE 8000
-
-# Set locale to UTF8, otherwise problems with the encoding can occur, e.g.
-# when using the invoke/wger commands and bower
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-
-# Install dependencies
-RUN apt-get install -y vim tmux sqlite3 python3-pip #python3-setuptools
-
-# Set up the application
-RUN git clone https://github.com/wger-project/wger.git /home/wger/src
-
-WORKDIR /home/wger/src
-RUN pip3 install --upgrade pip \
- && pip3 install -r requirements_devel.txt \
- && pip3 install gunicorn redis django_redis psycopg2 \
- && python3 setup.py develop \
- && chown -R wger:wger .
-
-USER wger
-RUN wger create_settings \
- --settings-path /home/wger/src/settings.py \
- --database-path /home/wger/db/database.sqlite \
- && wger bootstrap \
- --settings-path /home/wger/src/settings.py \
- --no-start-server
-
-# Install node modules for JS linting and download the exercise images
-#
-# Note: it seems there are problems with node and docker, so it's necessary
-# to delete the node_modules folder and install everything again
-# -> https://github.com/npm/npm/issues/9863
-# -> https://github.com/npm/npm/issues/13306
-RUN cd wger \
- && rm -r node_modules \
- && npm install bower \
- && npm install \
- && cd .. \
- && mkdir ~/media \
- && sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py \
- && echo STATIC_ROOT=\'/home/wger/static\' >> settings.py \
- && echo CACHES = { >> settings.py \
- && echo " 'default': {" >> settings.py \
- && echo " 'BACKEND': 'django_redis.cache.RedisCache'," >> settings.py \
- && echo " 'TIMEOUT': '48000'," >> settings.py \
- && echo " 'LOCATION': 'redis://redis:6379/0'," >> settings.py \
- && echo " 'OPTIONS': {" >> settings.py \
- && echo " 'CLIENT_CLASS': 'django_redis.client.DefaultClient'" >> settings.py \
- && echo " }" >> settings.py \
- && echo " }" >> settings.py \
- && echo " }" >> settings.py \
- && python3 manage.py collectstatic --noinput
-#
-#CACHES = {
-# "default": {
-# "BACKEND": "django_redis.cache.RedisCache",
-# "LOCATION": "redis://redis:6379/0",
-# "OPTIONS": {
-# "CLIENT_CLASS": "django_redis.client.DefaultClient",
-# }
-# }
-#}
-
-
-# && python manage.py download-exercise-images
-
-
-#ENTRYPOINT ["python3"]
-CMD ["gunicorn", "wger.wsgi:application", "-w", "2", "-b", ":8000"]
-#CMD ["manage.py", "runserver", "0.0.0.0:8000"]
diff --git a/extras/docker/production/docker-compose.yml b/extras/docker/production/docker-compose.yml
deleted file mode 100644
index 459ab14da..000000000
--- a/extras/docker/production/docker-compose.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-version: '2'
-services:
- ### Application
- web:
- restart: always
- build: ./application/
- expose:
- - "8000"
- links:
- - postgres:postgres
- - redis:redis
- env_file: env
- volumes:
- - /home/wger/static
- depends_on:
- - postgres
- - redis
-
- ### Reverse proxy
- nginx:
- restart: always
- build: ./nginx/
- ports:
- - "80:80"
- volumes_from:
- - web
- links:
- - web:web
-
- ### Database
- postgres:
- restart: always
- image: postgres:latest
- volumes_from:
- - data
- volumes:
- - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
- - ./backups/postgresql:/backup
- env_file:
- - env
- expose:
- - "5432"
-
- ### Cache
- redis:
- restart: always
- image: redis:latest
- expose:
- - "6379"
-
- ### Data volume
- data:
- restart: always
- image: alpine
- volumes:
- - /var/lib/postgresql
- command: "true"
diff --git a/extras/docker/production/nginx/Dockerfile b/extras/docker/production/nginx/Dockerfile
deleted file mode 100644
index db9381f86..000000000
--- a/extras/docker/production/nginx/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM tutum/nginx
-
-RUN rm /etc/nginx/sites-enabled/default
-ADD sites-enabled/ /etc/nginx/sites-enabled
diff --git a/extras/docker/production/nginx/sites-enabled/wger b/extras/docker/production/nginx/sites-enabled/wger
deleted file mode 100644
index 543f80e88..000000000
--- a/extras/docker/production/nginx/sites-enabled/wger
+++ /dev/null
@@ -1,18 +0,0 @@
-server {
-
- listen 80;
- server_name not.configured.example.com;
- charset utf-8;
-
- location /static {
- alias /home/wger/static/;
- }
-
- location / {
- proxy_pass http://web:8000;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- }
-
-}
diff --git a/extras/docker/production/postgres/docker-entrypoint-initdb.d/wger_project.sh b/extras/docker/production/postgres/docker-entrypoint-initdb.d/wger_project.sh
deleted file mode 100644
index 5110a2526..000000000
--- a/extras/docker/production/postgres/docker-entrypoint-initdb.d/wger_project.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-psql -U postgres -c "CREATE USER $DB_USER PASSWORD '$DB_PASS'"
-psql -U postgres -c "CREATE DATABASE $DB_NAME OWNER $DB_USER"