Merge branch 'release/2.2'

wger-project · Dec 6, 2023 · 913969c · 913969c
2 parents 6e8ccf0 + bff492e
commit 913969c
Show file tree

Hide file tree

Showing 34 changed files with 10,355 additions and 13,987 deletions.
diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml
@@ -39,4 +39,4 @@ jobs:
           push: true
           file: extras/docker/base/Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          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 --git a/.github/workflows/docker-demo.yml b/.github/workflows/docker-demo.yml
@@ -41,4 +41,4 @@ jobs:
           push: true
           file: extras/docker/demo/Dockerfile
           platforms: linux/amd64,linux/arm64
-          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
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -34,7 +34,7 @@ jobs:
           # https://github.com/docker/metadata-action
           tags: |
             type=raw,value=latest
-            type=raw,value=2.2-dev
+            type=raw,value=2.3-dev
           images: |
             ${{ env.REGISTRY_IMAGE }}
             ${{ env.REGISTRY_IMAGE_ALT }}
@@ -114,12 +114,10 @@ jobs:
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
-        # Think if we want to also build branches, PRs, tags, etc.
-        # https://github.com/docker/metadata-action
         with:
           tags: |
             type=raw,value=latest
-            type=raw,value=2.2-dev
+            type=raw,value=2.3-dev
           images: |
             ${{ env.REGISTRY_IMAGE }}
             ${{ env.REGISTRY_IMAGE_ALT }}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wger",
-  "version": "2.2.dev1",
+  "version": "2.3.dev1",
   "description": "Self hosted FLOSS fitness/workout and weight tracker",
   "repository": "github:wger-project/wger",
   "author": "",

diff --git a/wger/__init__.py b/wger/__init__.py
@@ -10,7 +10,7 @@
 
 MIN_APP_VERSION = (1, 6, 0, 'final', 1)
 
-VERSION = (2, 2, 0, 'alpha', 4)
+VERSION = (2, 3, 0, 'alpha', 1)
 RELEASE = True