Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into release/2.2

Roland Geiderbff492ef5ece
diff --cc .github/workflows/docker-base.yml
index e7005a62e,a6e4fb06c..2170f7223
--- a/.github/workflows/docker-base.yml
+++ b/.github/workflows/docker-base.yml
@@@ -39,4 -39,4 +39,4 @@@ jobs
push: true
file: extras/docker/base/Dockerfile
platforms: linux/amd64,linux/arm64,linux/arm/v7
- tags: wger/base:latest,wger/base:2.3-dev
- tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.2-dev
++ tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.3-dev
diff --cc .github/workflows/docker-demo.yml
index cfe5ad459,b0385798d..7f976b6a5
--- a/.github/workflows/docker-demo.yml
+++ b/.github/workflows/docker-demo.yml
@@@ -41,4 -41,4 +41,4 @@@ jobs
push: true
file: extras/docker/demo/Dockerfile
platforms: linux/amd64,linux/arm64
- tags: wger/demo:latest,wger/demo:2.3-dev,wger/apache:latest,wger/apache:2.3-dev
- tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.2-dev,${{ vars.REGISTRY_REPO }}/apache:latest,${{ vars.REGISTRY_REPO }}/apache:2.2-dev
++ tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.3-dev,${{ vars.REGISTRY_REPO }}/apache:latest,${{ vars.REGISTRY_REPO }}/apache:2.3-dev