Skip to content

Commit

Permalink
Move docker files from development to production
Browse files Browse the repository at this point in the history
  • Loading branch information
rolandgeider committed Oct 2, 2024
1 parent e021786 commit 178ca65
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 197 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ updates:
interval: "daily"

- package-ecosystem: "docker"
directory: "/extras/docker/development/"
directory: "/extras/docker/production/"
schedule:
interval: "daily"
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
189 changes: 0 additions & 189 deletions extras/docker/development/settings.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 178ca65

Please sign in to comment.