diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3a4b57cc2a..4c302e984e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.15.6-rc1 +current_version = 3.15.6 tag_name = {new_version} commit = True tag = True diff --git a/contrib/aleph-traefik-minio-keycloak/docker-compose.yml b/contrib/aleph-traefik-minio-keycloak/docker-compose.yml index 0583930362..8e19551d69 100644 --- a/contrib/aleph-traefik-minio-keycloak/docker-compose.yml +++ b/contrib/aleph-traefik-minio-keycloak/docker-compose.yml @@ -54,7 +54,7 @@ services: - "traefik.enable=false" worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6} command: gunicorn -w 6 -b 0.0.0.0:8000 --log-level debug --log-file - aleph.wsgi:app expose: - 8000 @@ -121,7 +121,7 @@ services: - "traefik.enable=false" ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.6} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 61576c8c41..6376574fad 100644 --- a/contrib/keycloak/docker-compose.dev-keycloak.yml +++ b/contrib/keycloak/docker-compose.dev-keycloak.yml @@ -16,7 +16,7 @@ services: elasticsearch: build: context: services/elasticsearch - image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-3.15.6} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: alephdata/aleph:${ALEPH_TAG:-3.15.6} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: alephdata/aleph:${ALEPH_TAG:-3.15.6} command: aleph run -h 0.0.0.0 -p 5000 --with-threads --reload --debugger ports: - "127.0.0.1:5000:5000" @@ -117,7 +117,7 @@ services: ui: build: context: ui - image: alephdata/aleph-ui:${ALEPH_TAG:-3.15.6-rc1} + image: alephdata/aleph-ui:${ALEPH_TAG:-3.15.6} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index 10e2785b60..1359b91eca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6} command: aleph worker restart: on-failure depends_on: @@ -54,7 +54,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6} command: /bin/bash depends_on: - postgres @@ -72,7 +72,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.15.6} command: gunicorn -w 6 -b 0.0.0.0:8000 --timeout 3600 --log-level debug --log-file - aleph.wsgi:app expose: - 8000 @@ -90,7 +90,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.6-rc1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.15.6} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index 93334f3740..0dc90a2e9b 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,6 +2,6 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 3.15.6-rc1 -appVersion: 3.15.6-rc1 +version: 3.15.6 +appVersion: 3.15.6 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 39e355bd3e..f58d35d2d7 100644 --- a/helm/charts/aleph/README.md +++ b/helm/charts/aleph/README.md @@ -11,7 +11,7 @@ Helm chart for Aleph | global.amazon | bool | `true` | Are we using AWS services like s3? | | global.google | bool | `false` | Are we using GCE services like storage, vision api? | | global.image.repository | string | `"alephdata/aleph"` | Aleph docker image repo | -| global.image.tag | string | `"3.15.6-rc1"` | Aleph docker image tag | +| global.image.tag | string | `"3.15.6"` | Aleph docker image tag | | global.image.tag | string | `"Always"` | | | global.namingPrefix | string | `"aleph"` | Prefix for the names of k8s resources | diff --git a/helm/charts/aleph/values.yaml b/helm/charts/aleph/values.yaml index 4cba1ea7b1..526dba527c 100644 --- a/helm/charts/aleph/values.yaml +++ b/helm/charts/aleph/values.yaml @@ -6,7 +6,7 @@ global: image: repository: ghcr.io/alephdata/aleph - tag: "3.15.6-rc1" + tag: "3.15.6" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index 65cf8601bc..14b3805a43 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="3.15.6-rc1", + version="3.15.6", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 029d2d4c45..f0c13ba409 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "3.15.6-rc1", + "version": "3.15.6", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.4",