Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add base docker image

Roland Geiderf7a4004653db
diff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfile
index c231e294e..a996aaa80 100644
--- a/extras/docker/apache/Dockerfile
+++ b/extras/docker/apache/Dockerfile
@@ -1,5 +1,5 @@
#
-# Dockerimage for wger development
+# A wger installation under apache with WSGI
#
# Please consult the documentation for usage
# docker build --tag wger/apache .
@@ -7,22 +7,13 @@
#
#
-FROM ubuntu:15.04
+FROM wger/base
MAINTAINER Roland Geider <[email protected]>
EXPOSE 80
# Install dependencies
-RUN apt-get update;\
- apt-get install -y apache2 libapache2-mod-wsgi-py3 \
- nodejs nodejs-legacy npm git \
- python-virtualenv python3-dev \
- libjpeg8-dev zlib1g-dev libwebp-dev \
- sudo vim
-
-# Add wger user
-RUN adduser wger --disabled-password --gecos ""
-RUN echo "wger ALL=(ALL) NOPASSWD:ALL" > etc/sudoers.d/wger
+RUN apt-get install -y apache2 libapache2-mod-wsgi-py3
# Configure apache
RUN a2dissite 000-default.conf
@@ -38,7 +29,7 @@ WORKDIR /home/wger/src
RUN npm install bower \
&& . /home/wger/venv/bin/activate \
&& pip install --upgrade pip \
- && pip install -r requirements_devel.txt \
+ && pip install -r requirements.txt \
&& invoke create_settings \
--settings-path /home/wger/src/settings.py \
--database-path /home/wger/db/database.sqlite \
diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfile
new file mode 100644
index 000000000..2919bd961
--- /dev/null
+++ b/extras/docker/base/Dockerfile
@@ -0,0 +1,24 @@
+#
+# Base Dockerimage for wger images
+#
+#
+# This dockerfile simply installs all common dependencies for the
+# other images and does not do anything on its own.
+#
+# docker build --tag wger/base .
+#
+
+FROM ubuntu:15.04
+
+MAINTAINER Roland Geider <[email protected]>
+
+# Install dependencies
+RUN apt-get update;\
+ apt-get install -y nodejs nodejs-legacy npm git \
+ python-virtualenv python3-dev \
+ libjpeg8-dev zlib1g-dev libwebp-dev \
+ sudo
+
+# Add wger user
+RUN adduser wger --disabled-password --gecos ""
+RUN echo "wger ALL=(ALL) NOPASSWD:ALL" > etc/sudoers.d/wger
\ No newline at end of file
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index 6667b50fd..c2521b55d 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -10,23 +10,16 @@
#
-FROM ubuntu:15.04
+FROM wger/base
MAINTAINER Roland Geider <[email protected]>
EXPOSE 8000
# Install dependencies
-RUN apt-get update;\
- apt-get install -y nodejs nodejs-legacy npm git \
- python-virtualenv python3-dev \
- libjpeg8-dev zlib1g-dev libwebp-dev \
- vim
-
-# Add wger user
-RUN adduser wger --disabled-password --gecos ""
-USER wger
+RUN apt-get install -y vim
# Set up the application
+USER wger
RUN git clone https://github.com/rolandgeider/wger.git /home/wger/src
WORKDIR /home/wger/src
RUN virtualenv --python python3 /home/wger/venv