From c63f4bbb93c73eab8306ee25b79dd781b20c8b9f Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Sat, 23 Nov 2024 07:17:09 +0100 Subject: [PATCH 01/23] servicelayer 1.23.2-rc1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2a2ad60f7..4a53025ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.1 +servicelayer[google,amazon]==1.23.2-rc1 normality==2.5.0 pantomime==0.6.1 From e62c5d447f0d1763e13ab3fd82da80ebc54ed9fd Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Sat, 23 Nov 2024 07:17:16 +0100 Subject: [PATCH 02/23] =?UTF-8?q?Bump=20version:=204.0.1=20=E2=86=92=204.0?= =?UTF-8?q?.2-rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5a2bba868..dc5b1b3c1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.1 +current_version = 4.0.2-rc1 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 6d3d2bca0..c3c5a902c 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:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} 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:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 0a050c38c..e36144943 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:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} 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:-ALEPH_TAG:-4.0.1} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index 1c11cdc32..da298c892 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index 0db2aa789..c5f2da9c7 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.1 -appVersion: 4.0.1 +version: 4.0.2-rc1 +appVersion: 4.0.2-rc1 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 59a2ccdcb..7bf18a65c 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 | `"global.image.tag | string | `"4.0.1"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.2-rc1"` | 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 f28d71ad2..369cd6ca9 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: "4.0.1" + tag: "4.0.2-rc1" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index e3d2c51bb..bc0edcaa8 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.1", + version="4.0.2-rc1", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 7bd0beeec..4089b9214 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.1", + "version": "4.0.2-rc1", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From fa2b6ae1e2532d8a58392efbde1161502ca14a5b Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Sat, 23 Nov 2024 13:15:40 +0100 Subject: [PATCH 03/23] servicelayer 1.23.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4a53025ca..c92477059 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.2-rc1 +servicelayer[google,amazon]==1.23.2 normality==2.5.0 pantomime==0.6.1 From 66102011b06c7abe4d692859d25a5711e25cc456 Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Sat, 23 Nov 2024 13:15:48 +0100 Subject: [PATCH 04/23] =?UTF-8?q?Bump=20version:=204.0.2-rc1=20=E2=86=92?= =?UTF-8?q?=204.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index dc5b1b3c1..5d4c2be30 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.2-rc1 +current_version = 4.0.2 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 c3c5a902c..6efde9516 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:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} 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:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index e36144943..417c0d48d 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:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} 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:-ALEPH_TAG:-4.0.2-rc1} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index da298c892..2c601d298 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2-rc1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index c5f2da9c7..2c0b260b5 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.2-rc1 -appVersion: 4.0.2-rc1 +version: 4.0.2 +appVersion: 4.0.2 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 7bf18a65c..81d9f9207 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 | `"global.image.tag | string | `"4.0.2-rc1"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.2"` | 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 369cd6ca9..5af8693cf 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: "4.0.2-rc1" + tag: "4.0.2" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index bc0edcaa8..91a679289 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.2-rc1", + version="4.0.2", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 4089b9214..dabbdc488 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.2-rc1", + "version": "4.0.2", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From f45f9a364b068efddd69e384a572949faeb8006a Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Fri, 13 Dec 2024 12:29:05 +0100 Subject: [PATCH 05/23] bugfix: Run batch indexing on index workers only --- aleph/worker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aleph/worker.py b/aleph/worker.py index 5818e5ad0..5a0c75cf3 100644 --- a/aleph/worker.py +++ b/aleph/worker.py @@ -155,7 +155,8 @@ def periodic(self): delete_expired_exports() delete_old_notifications() - self.run_indexing_batches() + if SETTINGS.STAGE_INDEX in SETTINGS.ALEPH_STAGES: + self.run_indexing_batches() except Exception: log.exception("Error while executing periodic tasks") From 28d8cbc59788ba315de41d502b61e4398bd61642 Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Fri, 13 Dec 2024 14:18:13 +0100 Subject: [PATCH 06/23] Use servicelayer 1.23.3-rc1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c92477059..04f134d6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.2 +servicelayer[google,amazon]==1.23.3-rc1 normality==2.5.0 pantomime==0.6.1 From 2ff613d0ed8aec9a5984731afa218270cd6cf7e7 Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Fri, 13 Dec 2024 14:49:46 +0100 Subject: [PATCH 07/23] =?UTF-8?q?Bump=20version:=204.0.2=20=E2=86=92=204.0?= =?UTF-8?q?.3-rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5d4c2be30..f8f389b8e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.2 +current_version = 4.0.3-rc1 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 6efde9516..1289a36d8 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:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} 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:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 417c0d48d..33e7ae4a8 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:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} 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:-ALEPH_TAG:-4.0.2} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index 2c601d298..41799ee57 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.2} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index 2c0b260b5..933d5c0c0 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.2 -appVersion: 4.0.2 +version: 4.0.3-rc1 +appVersion: 4.0.3-rc1 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 81d9f9207..84a1abfd6 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 | `"global.image.tag | string | `"4.0.2"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc1"` | 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 5af8693cf..78e2d9be6 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: "4.0.2" + tag: "4.0.3-rc1" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index 91a679289..832c9dda5 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.2", + version="4.0.3-rc1", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index dabbdc488..65cb42946 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.2", + "version": "4.0.3-rc1", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From 72c53fe04bc52bc6d2eddf5d86e14f556e30b1ca Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Tue, 17 Dec 2024 11:14:40 +0100 Subject: [PATCH 08/23] servicelayer 1.23.3-rc2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 04f134d6f..8bd83aa06 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.3-rc1 +servicelayer[google,amazon]==1.23.3-rc2 normality==2.5.0 pantomime==0.6.1 From bce62c0d4825990adab6076b037be7c04387d89c Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Tue, 17 Dec 2024 11:14:45 +0100 Subject: [PATCH 09/23] =?UTF-8?q?Bump=20version:=204.0.3-rc1=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f8f389b8e..15b163307 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc1 +current_version = 4.0.3-rc2 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 1289a36d8..657b1fb0c 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:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} 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:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 33e7ae4a8..0355759bf 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:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} 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:-ALEPH_TAG:-4.0.3-rc1} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index 41799ee57..a7e3c37cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc1} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index 933d5c0c0..115dd7ed9 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc1 -appVersion: 4.0.3-rc1 +version: 4.0.3-rc2 +appVersion: 4.0.3-rc2 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 84a1abfd6..950a172f7 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 | `"global.image.tag | string | `"4.0.3-rc1"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc2"` | 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 78e2d9be6..6aea66659 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: "4.0.3-rc1" + tag: "4.0.3-rc2" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index 832c9dda5..ad884a039 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc1", + version="4.0.3-rc2", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 65cb42946..db71959b2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc1", + "version": "4.0.3-rc2", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From 234e17a33891faad5a9291bb01448eb6007f5d8b Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Wed, 18 Dec 2024 14:35:03 +0100 Subject: [PATCH 10/23] servicelayer 1.23.3-rc3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8bd83aa06..a72ae6121 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.3-rc2 +servicelayer[google,amazon]==1.23.3-rc3 normality==2.5.0 pantomime==0.6.1 From 1111d0de8268a32076a3507173e7aaa03cb1025c Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Wed, 18 Dec 2024 14:35:10 +0100 Subject: [PATCH 11/23] =?UTF-8?q?Bump=20version:=204.0.3-rc2=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 15b163307..5c987a50b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc2 +current_version = 4.0.3-rc3 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 657b1fb0c..aa7356380 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:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} 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:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 0355759bf..d932a51dc 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:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} 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:-ALEPH_TAG:-4.0.3-rc2} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index a7e3c37cb..91399c0f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc2} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index 115dd7ed9..dae0bfb5f 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc2 -appVersion: 4.0.3-rc2 +version: 4.0.3-rc3 +appVersion: 4.0.3-rc3 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 950a172f7..54e1f623a 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 | `"global.image.tag | string | `"4.0.3-rc2"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc3"` | 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 6aea66659..ef47678dc 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: "4.0.3-rc2" + tag: "4.0.3-rc3" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index ad884a039..8d9a8b02a 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc2", + version="4.0.3-rc3", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index db71959b2..013b061f9 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc2", + "version": "4.0.3-rc3", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From 78f57ad3b11a4261b5506d007e751e9ed86481fe Mon Sep 17 00:00:00 2001 From: Alex Stefanescu Date: Wed, 18 Dec 2024 17:21:21 +0100 Subject: [PATCH 12/23] Bump servicelayer to 1.23.3-rc4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a72ae6121..195af1d64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.3-rc3 +servicelayer[google,amazon]==1.23.3-rc4 normality==2.5.0 pantomime==0.6.1 From c2de577dc3d292b3b626f4fe6eb0a1564f54019d Mon Sep 17 00:00:00 2001 From: Alex Stefanescu Date: Wed, 18 Dec 2024 17:29:18 +0100 Subject: [PATCH 13/23] =?UTF-8?q?Bump=20version:=204.0.3-rc3=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5c987a50b..cc34d518e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc3 +current_version = 4.0.3-rc4 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 aa7356380..ca6ea111c 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:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} 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:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index d932a51dc..9acc356af 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:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} 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:-ALEPH_TAG:-4.0.3-rc3} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index 91399c0f5..c5207885f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc3} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index dae0bfb5f..d929e2b6a 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc3 -appVersion: 4.0.3-rc3 +version: 4.0.3-rc4 +appVersion: 4.0.3-rc4 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 54e1f623a..197cb6b99 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 | `"global.image.tag | string | `"4.0.3-rc3"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc4"` | 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 ef47678dc..f57ad6fd7 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: "4.0.3-rc3" + tag: "4.0.3-rc4" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index 8d9a8b02a..d93567446 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc3", + version="4.0.3-rc4", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 013b061f9..7deafd4b8 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc3", + "version": "4.0.3-rc4", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From 61ecb4f0c52ee3ff1bafbd2804b26f6df37d5935 Mon Sep 17 00:00:00 2001 From: Alex Stefanescu Date: Thu, 19 Dec 2024 11:58:10 +0100 Subject: [PATCH 14/23] Bump servicelayer to 1.23.3-rc5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 195af1d64..8fd7eee22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.3-rc4 +servicelayer[google,amazon]==1.23.3-rc5 normality==2.5.0 pantomime==0.6.1 From a59ad5d0165b322b8e235f85024c2b1e0431daaa Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Thu, 19 Dec 2024 13:23:15 +0100 Subject: [PATCH 15/23] =?UTF-8?q?Bump=20version:=204.0.3-rc4=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cc34d518e..8394777a0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc4 +current_version = 4.0.3-rc5 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 ca6ea111c..bd115ea43 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:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} 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:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 9acc356af..9fd8a10c9 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:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} 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:-ALEPH_TAG:-4.0.3-rc4} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index c5207885f..6ffdda64c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc4} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index d929e2b6a..c0d9dd5d8 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc4 -appVersion: 4.0.3-rc4 +version: 4.0.3-rc5 +appVersion: 4.0.3-rc5 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 197cb6b99..e5f1651e2 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 | `"global.image.tag | string | `"4.0.3-rc4"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc5"` | 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 f57ad6fd7..7fdc4e50b 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: "4.0.3-rc4" + tag: "4.0.3-rc5" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index d93567446..6d8d9b82d 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc4", + version="4.0.3-rc5", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 7deafd4b8..5954586d9 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc4", + "version": "4.0.3-rc5", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From 0ef3b84e1511e898ed7bc0157f09c98aba14f7fd Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Mon, 6 Jan 2025 16:39:24 +0100 Subject: [PATCH 16/23] servicelayer 1.23.3-rc6 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8fd7eee22..51a54d545 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.3-rc5 +servicelayer[google,amazon]==1.23.3-rc6 normality==2.5.0 pantomime==0.6.1 From 96084f38ed3423c4b4c00a774911ce90c0ed8459 Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Mon, 6 Jan 2025 16:39:37 +0100 Subject: [PATCH 17/23] =?UTF-8?q?Bump=20version:=204.0.3-rc5=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8394777a0..a25514df8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc5 +current_version = 4.0.3-rc6 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 bd115ea43..72fcb877d 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:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} 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:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 9fd8a10c9..5341219ba 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:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} 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:-ALEPH_TAG:-4.0.3-rc5} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index 6ffdda64c..71cc09a17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc5} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index c0d9dd5d8..73f476f5a 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc5 -appVersion: 4.0.3-rc5 +version: 4.0.3-rc6 +appVersion: 4.0.3-rc6 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index e5f1651e2..ee4b0969b 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 | `"global.image.tag | string | `"4.0.3-rc5"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc6"` | 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 7fdc4e50b..583c5c7e6 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: "4.0.3-rc5" + tag: "4.0.3-rc6" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index 6d8d9b82d..9fb3ad4c5 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc5", + version="4.0.3-rc6", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 5954586d9..f7354e5e2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc5", + "version": "4.0.3-rc6", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From 6e4828e6a4c1ecd796473a487bc03d3db506bc49 Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Tue, 7 Jan 2025 15:25:51 +0100 Subject: [PATCH 18/23] servicelayer 1.23.3-rc7 and sentry-sdk 2.19.2 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 51a54d545..6326d053d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ followthemoney==3.5.9 followthemoney-store[postgresql]==3.1.0 followthemoney-compare==0.4.4 fingerprints==1.2.3 -servicelayer[google,amazon]==1.23.3-rc6 +servicelayer[google,amazon]==1.23.3-rc7 normality==2.5.0 pantomime==0.6.1 @@ -36,7 +36,7 @@ requests[security] >= 2.25.1, < 3.0.0 tabulate==0.9.0 zipstream-new==1.1.8 pika==1.3.2 -sentry-sdk[flask]==2.10.0 +sentry-sdk[flask]==2.19.2 prometheus-client==0.17.1 From 43a4169cb6254321100cac61c27f70610dc2530b Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Tue, 7 Jan 2025 15:25:55 +0100 Subject: [PATCH 19/23] =?UTF-8?q?Bump=20version:=204.0.3-rc6=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a25514df8..433651925 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc6 +current_version = 4.0.3-rc7 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 72fcb877d..8e53ad2c9 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:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} 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:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 5341219ba..65829cbe7 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:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} 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:-ALEPH_TAG:-4.0.3-rc6} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index 71cc09a17..fda6119d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc6} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index 73f476f5a..ace579de1 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc6 -appVersion: 4.0.3-rc6 +version: 4.0.3-rc7 +appVersion: 4.0.3-rc7 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index ee4b0969b..6cf556a89 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 | `"global.image.tag | string | `"4.0.3-rc6"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc7"` | 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 583c5c7e6..91db233fe 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: "4.0.3-rc6" + tag: "4.0.3-rc7" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index 9fb3ad4c5..a5aae345b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc6", + version="4.0.3-rc7", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index f7354e5e2..5ddc6a863 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc6", + "version": "4.0.3-rc7", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From a3030a1e50bf83622e89835f4088b8038c0ba2b1 Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Tue, 7 Jan 2025 15:54:21 +0100 Subject: [PATCH 20/23] bugfix: prevent double sentry_sdk init --- aleph/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aleph/core.py b/aleph/core.py index 62a17cb10..b72292d61 100644 --- a/aleph/core.py +++ b/aleph/core.py @@ -68,7 +68,7 @@ def create_app(config=None): configure_logging(level=logging.DEBUG) - if SETTINGS.SENTRY_DSN: + if SETTINGS.SENTRY_DSN and not sentry_sdk.get_client().is_active(): sentry_sdk.init( dsn=SETTINGS.SENTRY_DSN, integrations=[ From 9305aceee7149b0e915014deaeda70931040fa7c Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Tue, 7 Jan 2025 15:54:39 +0100 Subject: [PATCH 21/23] =?UTF-8?q?Bump=20version:=204.0.3-rc7=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 433651925..bdbd74a98 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc7 +current_version = 4.0.3-rc8 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 8e53ad2c9..81e489b3d 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:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} 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:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 65829cbe7..75c18c2e2 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:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} 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:-ALEPH_TAG:-4.0.3-rc7} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index fda6119d5..d59f9798e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc7} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index ace579de1..a32a695f9 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc7 -appVersion: 4.0.3-rc7 +version: 4.0.3-rc8 +appVersion: 4.0.3-rc8 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 6cf556a89..25a826d59 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 | `"global.image.tag | string | `"4.0.3-rc7"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc8"` | 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 91db233fe..3b0137374 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: "4.0.3-rc7" + tag: "4.0.3-rc8" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index a5aae345b..3543e0ce4 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc7", + version="4.0.3-rc8", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 5ddc6a863..96b8a36c1 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc7", + "version": "4.0.3-rc8", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5", From dfe636f0bf00f6378aa76dcfcfaf2156f39e8acb Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Wed, 8 Jan 2025 12:37:01 +0100 Subject: [PATCH 22/23] feat: distinct sentry init for api app --- aleph/core.py | 16 ---------------- aleph/wsgi.py | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/aleph/core.py b/aleph/core.py index b72292d61..c97e2db37 100644 --- a/aleph/core.py +++ b/aleph/core.py @@ -23,16 +23,12 @@ from werkzeug.local import LocalProxy from werkzeug.middleware.profiler import ProfilerMiddleware -from aleph import __version__ as aleph_version from aleph.settings import SETTINGS from aleph.cache import Cache from aleph.oauth import configure_oauth from aleph.util import LoggingTransport from aleph.metrics.flask import PrometheusExtension -import sentry_sdk -from sentry_sdk.integrations.flask import FlaskIntegration - NONE = "'none'" log = logging.getLogger(__name__) @@ -67,18 +63,6 @@ def create_app(config=None): config = {} configure_logging(level=logging.DEBUG) - - if SETTINGS.SENTRY_DSN and not sentry_sdk.get_client().is_active(): - sentry_sdk.init( - dsn=SETTINGS.SENTRY_DSN, - integrations=[ - FlaskIntegration(), - ], - traces_sample_rate=0, - release=aleph_version, - environment=SETTINGS.SENTRY_ENVIRONMENT, - send_default_pii=False, - ) app = Flask("aleph") app.config.from_object(SETTINGS) app.config.update(config) diff --git a/aleph/wsgi.py b/aleph/wsgi.py index 17baf8255..96e9cea9c 100644 --- a/aleph/wsgi.py +++ b/aleph/wsgi.py @@ -1,3 +1,20 @@ from aleph.core import create_app +from aleph.settings import SETTINGS +from aleph import __version__ as aleph_version +import sentry_sdk +from sentry_sdk.integrations.flask import FlaskIntegration + + +if SETTINGS.SENTRY_DSN: + sentry_sdk.init( + dsn=SETTINGS.SENTRY_DSN, + integrations=[ + FlaskIntegration(), + ], + traces_sample_rate=0, + release=aleph_version, + environment=SETTINGS.SENTRY_ENVIRONMENT, + send_default_pii=False, + ) app = create_app() From bdd8f2692c5534f92a94f3ad35f9ae3d3306ebd0 Mon Sep 17 00:00:00 2001 From: Christian Stefanescu Date: Wed, 8 Jan 2025 12:37:06 +0100 Subject: [PATCH 23/23] =?UTF-8?q?Bump=20version:=204.0.3-rc8=20=E2=86=92?= =?UTF-8?q?=204.0.3-rc9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- contrib/aleph-traefik-minio-keycloak/docker-compose.yml | 8 ++++---- contrib/keycloak/docker-compose.dev-keycloak.yml | 8 ++++---- docker-compose.yml | 8 ++++---- helm/charts/aleph/Chart.yaml | 4 ++-- helm/charts/aleph/README.md | 2 +- helm/charts/aleph/values.yaml | 2 +- setup.py | 2 +- ui/package.json | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bdbd74a98..2c052c215 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.3-rc8 +current_version = 4.0.3-rc9 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 81e489b3d..6ff63c230 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:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} command: aleph worker restart: on-failure links: @@ -79,7 +79,7 @@ services: - "traefik.enable=false" shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} command: /bin/bash depends_on: - postgres @@ -99,7 +99,7 @@ services: - "traefik.enable=false" api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} 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:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} depends_on: - api - traefik diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml index 75c18c2e2..0c8c15338 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:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} hostname: elasticsearch environment: - discovery.type=single-node @@ -55,7 +55,7 @@ services: app: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} hostname: aleph command: /bin/bash links: @@ -83,7 +83,7 @@ services: api: build: context: . - image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} 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:-ALEPH_TAG:-4.0.3-rc8} + image: alephdata/aleph-ui:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} links: - api command: npm run start diff --git a/docker-compose.yml b/docker-compose.yml index d59f9798e..9a8b20b14 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - aleph.env worker: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} command: aleph worker restart: on-failure depends_on: @@ -62,7 +62,7 @@ services: - aleph.env shell: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} command: /bin/bash depends_on: - postgres @@ -80,7 +80,7 @@ services: - aleph.env api: - image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} expose: - 8000 depends_on: @@ -97,7 +97,7 @@ services: - aleph.env ui: - image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc8} + image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-ALEPH_TAG:-4.0.3-rc9} depends_on: - api ports: diff --git a/helm/charts/aleph/Chart.yaml b/helm/charts/aleph/Chart.yaml index a32a695f9..f78a89cf0 100644 --- a/helm/charts/aleph/Chart.yaml +++ b/helm/charts/aleph/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: aleph description: Helm chart for Aleph type: application -version: 4.0.3-rc8 -appVersion: 4.0.3-rc8 +version: 4.0.3-rc9 +appVersion: 4.0.3-rc9 diff --git a/helm/charts/aleph/README.md b/helm/charts/aleph/README.md index 25a826d59..bb1423f94 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 | `"global.image.tag | string | `"4.0.3-rc8"` | Aleph docker image tag | +| global.image.tag | string | `"global.image.tag | string | `"4.0.3-rc9"` | 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 3b0137374..ffce5f12e 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: "4.0.3-rc8" + tag: "4.0.3-rc9" pullPolicy: Always commonEnv: diff --git a/setup.py b/setup.py index 3543e0ce4..ff52f1553 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="aleph", - version="4.0.3-rc8", + version="4.0.3-rc9", description="Document sifting web frontend", classifiers=[ "Intended Audience :: Developers", diff --git a/ui/package.json b/ui/package.json index 96b8a36c1..0d0ef920e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "aleph-ui", - "version": "4.0.3-rc8", + "version": "4.0.3-rc9", "private": true, "dependencies": { "@alephdata/followthemoney": "^3.5.5",