Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename docker image from wger/devel to wger/server

Roland Geider9bb76258ce00
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0d11c4c6b..840c55a4f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -40,4 +40,4 @@ jobs:
push: true
file: extras/docker/development/Dockerfile
platforms: linux/amd64,linux/arm64
- tags: wger/devel:latest,wger/devel:2.1-dev
+ tags: wger/server:latest,wger/server:2.1-dev,wger/devel:latest,wger/devel:2.1-dev
diff --git a/docs/docker.rst b/docs/docker.rst
index 46c1c3f58..890e1afe3 100644
--- a/docs/docker.rst
+++ b/docs/docker.rst
@@ -7,7 +7,7 @@ them yourself.
Note that you need to build from the project's source folder, e.g::
- docker build -f extras/docker/development/Dockerfile -t wger/devel .
+ docker build -f extras/docker/development/Dockerfile -t wger/server .
docker build -f extras/docker/demo/Dockerfile --tag wger/demo .
@@ -36,11 +36,11 @@ and serves it with Django's development server.
Get the image::
- docker pull wger/devel
+ docker pull wger/server
Run a container and start the application::
- docker run -ti --name wger.devel --publish 8000:8000 wger/devel
+ docker run -ti --name wger.dev --publish 8000:8000 wger/server
(in docker) source ~/venv/bin/activate
(in docker) python manage.py runserver 0.0.0.0:8000
@@ -54,7 +54,7 @@ your host machine and use docker only to serve it. Then do this::
--name wger.test1 \
--publish 8005:8000 \
--volume /path/to/local/wger/:/home/wger/src \
- wger/devel
+ wger/server
It will mount the local path *on top* of the folder in the container. For this to
work you obviously need to manually checkout the code to ``/path/to/local/wger/``
diff --git a/extras/docker/base/README.md b/extras/docker/base/README.md
index dcbc31105..d6b98d66c 100644
--- a/extras/docker/base/README.md
+++ b/extras/docker/base/README.md
@@ -3,7 +3,7 @@ Development image for wger - Base image
This is the base image for some of the other wger images and offers no
functionality, it's only use is to provide some common dependencies.
-If you want to develop, try ``wger/devel``.
+If you want to develop, try ``wger/server``.
Contact
diff --git a/extras/docker/compose/README.md b/extras/docker/compose/README.md
index 3e4a7c073..ac0072e6d 100644
--- a/extras/docker/compose/README.md
+++ b/extras/docker/compose/README.md
@@ -65,7 +65,7 @@ the file to re-run migrations, etc.
## Building
If you want to build this yourself, keep in mind that you **must** build from the
-project root. Make sure the wger/devel image is available locally as well:
+project root. Make sure the wger/server image is available locally as well:
docker-compose -f extras/docker/compose/docker-compose.yml build.
diff --git a/extras/docker/compose/docker-compose.yml b/extras/docker/compose/docker-compose.yml
index ad98e823f..9a69fc122 100644
--- a/extras/docker/compose/docker-compose.yml
+++ b/extras/docker/compose/docker-compose.yml
@@ -2,14 +2,14 @@ version: '3.7'
services:
web:
- image: wger/devel:2.1-dev
+ image: wger/server:latest
volumes:
- type: bind
source: ../../../
target: /home/wger/src/
- media:/home/wger/media
ports:
- - 8000:8000
+ - "8000:8000"
env_file:
- ./dev.env
depends_on:
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index fa97c6564..278c29010 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -4,10 +4,10 @@
# 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/devel .
+# docker build -f extras/docker/development/Dockerfile --tag wger/server .
#
# Run the container:
-# docker run -ti -v /path/to/this/checkout:/home/wger/src --name wger.devel --publish 8000:8000 wger/devel
+# docker run -ti -v /path/to/this/checkout:/home/wger/src --name wger.dev --publish 8000:8000 wger/server
##########
# Builder
diff --git a/extras/docker/development/README.md b/extras/docker/development/README.md
index 9414bea09..1c4623bdc 100644
--- a/extras/docker/development/README.md
+++ b/extras/docker/development/README.md
@@ -26,7 +26,7 @@ A more comfortable development version is provided in the compose folder.
docker run -ti \
-v /path/to/your/wger/checkout:/home/wger/src \
--name wger.devel \
- --publish 8000:8000 wger/devel
+ --publish 8000:8000 wger/server
When developing with windows, you might have problems with the `--volume` option,
use the more verbose mount instead:
@@ -63,7 +63,7 @@ If you need to update the CSS/JS libraries or just issue some other command:
If you build this yourself, keep in mind that you **must** build from the
project root!
-```docker build -f extras/docker/development/Dockerfile --tag wger/devel .```
+```docker build -f extras/docker/development/Dockerfile --tag wger/server .```
## Contact