diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1f5aa8..d4d6f6d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,7 +145,7 @@ jobs: source venv/bin/activate (bash install_dev_dependencies.sh && python3 setup.py sdist) || exit 1 # copy into separate file to prevent issues where the source and target are the same - mv dist/compose_client-2.3.1*.tar.gz dist/release.tar.gz + mv dist/compose_client-2.3.2*.tar.gz dist/release.tar.gz mv dist/release.tar.gz dist/compose_client-$RELEASE_VERSION.tar.gz - name: "zip deploy/local folder" diff --git a/client/compose_client/cli/main.py b/client/compose_client/cli/main.py index e34d755..4538dd2 100644 --- a/client/compose_client/cli/main.py +++ b/client/compose_client/cli/main.py @@ -29,7 +29,7 @@ @click.group() def cli() -> None: """ - NF Compose CLI - version: 2.3.1 + NF Compose CLI - version: 2.3.2 """ pass diff --git a/client/compose_client/library/connection/client.py b/client/compose_client/library/connection/client.py index a005169..dedbb3f 100644 --- a/client/compose_client/library/connection/client.py +++ b/client/compose_client/library/connection/client.py @@ -22,7 +22,7 @@ import datetime -USER_AGENT = 'compose_cli 2.3.1' +USER_AGENT = 'compose_cli 2.3.2' class APIClient(abc.ABC): diff --git a/client/setup.py b/client/setup.py index 43399e5..3da5580 100644 --- a/client/setup.py +++ b/client/setup.py @@ -20,7 +20,7 @@ def cli_test_suite(): setuptools.setup( name="compose_client", scripts=['bin/compose_cli'], - version="2.3.1", + version="2.3.2", author="NeuroForge GmbH & Co. KG", author_email="kontakt@neuroforge.de", description="NF Compose package", diff --git a/deploy/local/compose/docker-compose.yml b/deploy/local/compose/docker-compose.yml index 8d47f13..b15f0b7 100644 --- a/deploy/local/compose/docker-compose.yml +++ b/deploy/local/compose/docker-compose.yml @@ -44,7 +44,7 @@ services: restart: unless-stopped nfcomposeskipper: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" networks: postgres: nfcompose: @@ -66,7 +66,7 @@ services: # inside facing container used for separating internal requests so that outside requests are not harmed by etl jobs nfcomposeskipper_internal: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" networks: postgres: nfcompose: @@ -86,7 +86,7 @@ services: SKIPPER_TASK_DASHBOARD_UPSTREAM: "http://skipper.task.dashboard.${INTERNAL_DOMAIN_SUFFIX:-test.local}:5555" nfcompose_skipper_celery: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" networks: - postgres - nfcompose @@ -104,7 +104,7 @@ services: restart: unless-stopped nfcompose_skipper_celery_beat: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" networks: - postgres - nfcompose @@ -126,7 +126,7 @@ services: restart: unless-stopped nfcompose_skipper_task_dashboard: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" networks: postgres: {} nfcompose: @@ -144,7 +144,7 @@ services: restart: unless-stopped nfcomposeskipperproxy: - image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.3.1}" + image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.3.2}" restart: unless-stopped depends_on: - nfcomposeskipper diff --git a/deploy/local/integration/library/client.py b/deploy/local/integration/library/client.py index a105bf2..8007722 100644 --- a/deploy/local/integration/library/client.py +++ b/deploy/local/integration/library/client.py @@ -17,7 +17,7 @@ from library.types import JSONType -USER_AGENT = 'integration_test compose 2.3.1' +USER_AGENT = 'integration_test compose 2.3.2' class APIClient(abc.ABC): diff --git a/deploy/production/docker-compose/docker-compose.yml b/deploy/production/docker-compose/docker-compose.yml index 12d58a8..6eb9471 100644 --- a/deploy/production/docker-compose/docker-compose.yml +++ b/deploy/production/docker-compose/docker-compose.yml @@ -156,7 +156,7 @@ services: - "nodered.local" consumer_gateway: - image: "${SKIPPER_CONSUMER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.3.1}" + image: "${SKIPPER_CONSUMER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.3.2}" restart: unless-stopped networks: postgres: @@ -171,7 +171,7 @@ services: start_period: 1s skipper: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" restart: unless-stopped networks: postgres: @@ -187,7 +187,7 @@ services: # inside facing container used for separating internal requests so that outside requests are not harmed by etl jobs skipper_internal: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" restart: unless-stopped networks: postgres: @@ -203,7 +203,7 @@ services: SKIPPER_DJANGO_EXTRA_ALLOWED_HOSTS: "skipper.internal.local" skipper_celery: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" restart: unless-stopped networks: - postgres @@ -220,7 +220,7 @@ services: SKIPPER_CELERY_WORKER_QUEUES: "celery,data_series_cleanup,persist_data,file_registry_cleanup,index_creation,requeue_persist_data" skipper_celery_beat: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" restart: unless-stopped networks: - postgres @@ -231,7 +231,7 @@ services: SKIPPER_CONTAINER_TYPE: "CELERY_BEAT" skipper_task_dashboard: - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" restart: unless-stopped networks: postgres: {} @@ -243,7 +243,7 @@ services: SKIPPER_CONTAINER_TYPE: "TASK_DASHBOARD" skipper_proxy: - image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.3.1}" + image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.3.2}" environment: SKIPPER_BACKEND_SERVICE: "skipper.local" SKIPPER_BACKEND_SERVICE_PORT: "8000" @@ -287,7 +287,7 @@ services: python manage.py collectstatic --noinput check_result "failed to collect static files" - image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.1}" + image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.3.2}" environment: # force rerun everytime DEPLOY_DATE: "${DEPLOY_DATE}"