Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.1.6
current_version = 4.1.8-rc1
tag_name = {new_version}
commit = True
tag = True
Expand Down
4 changes: 2 additions & 2 deletions aleph/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def flush(self, prefix=None):
log.info("Flush: %s", key)
keys.append(key)
if len(keys) > 0 and len(keys) % 1000 == 0:
self.kv.delete(*keys)
self.kv.unlink(*keys)
keys = []
if len(keys) > 0:
self.kv.delete(*keys)
self.kv.unlink(*keys)
8 changes: 4 additions & 4 deletions contrib/aleph-traefik-minio-keycloak/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ services:
- "traefik.enable=false"

worker:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
command: aleph worker
restart: on-failure
links:
Expand All @@ -79,7 +79,7 @@ services:
- "traefik.enable=false"

shell:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
command: /bin/bash
depends_on:
- postgres
Expand All @@ -99,7 +99,7 @@ services:
- "traefik.enable=false"

api:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
command: gunicorn -w 6 -b 0.0.0.0:8000 --log-level debug --log-file - aleph.wsgi:app
expose:
- 8000
Expand All @@ -121,7 +121,7 @@ services:
- "traefik.enable=false"

ui:
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-4.1.8-rc1}
depends_on:
- api
- traefik
Expand Down
8 changes: 4 additions & 4 deletions contrib/keycloak/docker-compose.dev-keycloak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
elasticsearch:
build:
context: services/elasticsearch
image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-4.1.8-rc1}
hostname: elasticsearch
environment:
- discovery.type=single-node
Expand Down Expand Up @@ -55,7 +55,7 @@ services:
app:
build:
context: .
image: alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
hostname: aleph
command: /bin/bash
links:
Expand Down Expand Up @@ -83,7 +83,7 @@ services:
api:
build:
context: .
image: alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
command: aleph run -h 0.0.0.0 -p 5000 --with-threads --reload --debugger
ports:
- "127.0.0.1:5000:5000"
Expand Down Expand Up @@ -117,7 +117,7 @@ services:
ui:
build:
context: ui
image: alephdata/aleph-ui:${ALEPH_TAG:-4.1.6}
image: alephdata/aleph-ui:${ALEPH_TAG:-4.1.8-rc1}
links:
- api
command: npm run start
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
- aleph.env

worker:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
command: aleph worker
restart: on-failure
depends_on:
Expand All @@ -62,7 +62,7 @@ services:
- aleph.env

shell:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
command: /bin/bash
depends_on:
- postgres
Expand All @@ -80,7 +80,7 @@ services:
- aleph.env

api:
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-4.1.8-rc1}
expose:
- 8000
depends_on:
Expand All @@ -97,7 +97,7 @@ services:
- aleph.env

ui:
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-4.1.6}
image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-4.1.8-rc1}
depends_on:
- api
ports:
Expand Down
4 changes: 2 additions & 2 deletions helm/charts/aleph/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: aleph
description: Helm chart for Aleph
type: application
version: 4.1.6
appVersion: 4.1.6
version: 4.1.8-rc1
appVersion: 4.1.8-rc1
2 changes: 1 addition & 1 deletion helm/charts/aleph/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `"4.1.6"` | Aleph docker image tag |
| global.image.tag | string | `"4.1.8-rc1"` | Aleph docker image tag |
| global.image.tag | string | `"Always"` | |
| global.namingPrefix | string | `"aleph"` | Prefix for the names of k8s resources |

Expand Down
2 changes: 1 addition & 1 deletion helm/charts/aleph/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ global:

image:
repository: ghcr.io/alephdata/aleph
tag: "4.1.6"
tag: "4.1.8-rc1"
pullPolicy: Always

commonEnv:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
servicelayer[google,amazon]==1.25.2
normality==2.5.0
pantomime==0.6.1

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name="aleph",
version="4.1.6",
version="4.1.8-rc1",
description="Document sifting web frontend",
classifiers=[
"Intended Audience :: Developers",
Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aleph-ui",
"version": "4.1.6",
"version": "4.1.8-rc1",
"private": true,
"dependencies": {
"@alephdata/followthemoney": "^3.8.2",
Expand Down
Loading