Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make docker-compose work (seemingly)

Roland Geider86c73cb0f9fc
diff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfile
index af0abf790..646bc0c82 100644
--- a/extras/docker/apache/Dockerfile
+++ b/extras/docker/apache/Dockerfile
@@ -38,18 +38,11 @@ RUN pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_de
# Final
########
FROM wger/base:2.0-dev
-
LABEL maintainer="Roland Geider <[email protected]>"
+
ARG DOCKER_DIR=./extras/docker/apache
EXPOSE 80
-# 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 update \
@@ -78,14 +71,14 @@ RUN chmod 0644 /etc/cron.d/wger \
&& touch /var/log/cron.log
COPY --from=builder /usr/src/app/wheels /wheels
-#COPY --chown=wger:www-data . /home/wger/src
+COPY --chown=wger:www-data . /home/wger/src
# Set up the application
RUN ln -s /home/wger/static/CACHE /var/www
USER wger
WORKDIR /home/wger/src
-RUN git clone https://github.com/wger-project/wger.git
+#RUN git clone https://github.com/wger-project/wger.git
RUN python3 -m venv /home/wger/venv
RUN . /home/wger/venv/bin/activate \
&& pip install --upgrade pip \
diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfile
index 55e059911..b840307ee 100644
--- a/extras/docker/base/Dockerfile
+++ b/extras/docker/base/Dockerfile
@@ -24,7 +24,16 @@ RUN apt-get update \
python3-pip \
sqlite3 \
netcat-openbsd \
- && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/* \
+ && locale-gen en_US.UTF-8
+
+# Environmental variables
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
# Add wger user
diff --git a/extras/docker/development-venv/Dockerfile b/extras/docker/development-venv/Dockerfile
index b91c10eb1..62b9a9ab8 100644
--- a/extras/docker/development-venv/Dockerfile
+++ b/extras/docker/development-venv/Dockerfile
@@ -54,13 +54,6 @@ 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.
-# 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
-
# Set up the application
USER wger
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index a76129210..05e1cee90 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -38,15 +38,6 @@ LABEL maintainer="Roland Geider <[email protected]>"
ARG DOCKER_DIR=./extras/docker/development
EXPOSE 8000
-# Set locale to UTF8
-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
-
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-
# Set up the application
WORKDIR /home/wger/src
@@ -60,7 +51,8 @@ RUN pip3 install --no-cache /wheels/* \
&& pip3 install psycopg2-binary \
&& pip3 install python-memcached \
&& python3 setup.py develop \
- && npm install
+ && npm install -g bower
+
RUN chown -R wger:wger .
USER wger
diff --git a/extras/docker/development/README.md b/extras/docker/development/README.md
index c94a7af19..535461c4e 100644
--- a/extras/docker/development/README.md
+++ b/extras/docker/development/README.md
@@ -1,4 +1,4 @@
-# Development image for wger - Ubuntu based
+# Development image for wger
Thank you for downloading wger Workout Manager. wger (ˈvɛɡɐ) is a free, open
source web application that manages your exercises and personal workouts, weight
diff --git a/extras/docker/development/entrypoint.sh b/extras/docker/development/entrypoint.sh
index 3be8c8bb8..6265ab7c3 100644
--- a/extras/docker/development/entrypoint.sh
+++ b/extras/docker/development/entrypoint.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-# Copy a settings file if not fould
-if [ test ! -f /home/wger/src ]
- cp /tmp/settings.py /home/wger/src
+# Copy a settings file if nothing's found (e.g. when mounting a fresh checkout)
+if [ ! -f /home/wger/src/settings.py ]; then
+ cp /tmp/settings.py /home/wger/src
fi
# If using docker compose, wait for postgres
diff --git a/extras/docker/docker-compose/docker-compose.yml b/extras/docker/docker-compose/docker-compose.yml
index 2f9586ebb..10964443d 100644
--- a/extras/docker/docker-compose/docker-compose.yml
+++ b/extras/docker/docker-compose/docker-compose.yml
@@ -2,15 +2,11 @@ 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/
+ image: wger/devel:2.0-dev
+ volumes:
+ - type: bind
+ source: ../../../
+ target: /home/wger/src/
ports:
- 8000:8000
env_file:
@@ -22,7 +18,7 @@ services:
image: postgres:12.0-alpine
volumes:
- type: bind
- source: /tmp/wger-postgres-data
+ source: ./wger-postgres-data
target: /var/lib/postgresql/data/
environment:
- POSTGRES_USER=wger