Skip to content

Commit

Permalink
bump NF Compose version to 2.2.14
Browse files Browse the repository at this point in the history
  • Loading branch information
s4ke committed Sep 12, 2024
1 parent c55f2cb commit cffd65a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.13*.tar.gz dist/release.tar.gz
mv dist/compose_client-2.2.14*.tar.gz dist/release.tar.gz
mv dist/release.tar.gz dist/compose_client-$RELEASE_VERSION.tar.gz
- name: "zip deploy/local folder"
Expand Down
2 changes: 1 addition & 1 deletion client/compose_client/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@click.group()
def cli() -> None:
"""
NF Compose CLI - version: 2.2.13
NF Compose CLI - version: 2.2.14
"""
pass

Expand Down
2 changes: 1 addition & 1 deletion client/compose_client/library/connection/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import datetime


USER_AGENT = 'compose_cli 2.2.13'
USER_AGENT = 'compose_cli 2.2.14'


class APIClient(abc.ABC):
Expand Down
2 changes: 1 addition & 1 deletion client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def cli_test_suite():
setuptools.setup(
name="compose_client",
scripts=['bin/compose_cli'],
version="2.2.13",
version="2.2.14",
author="NeuroForge GmbH & Co. KG",
author_email="kontakt@neuroforge.de",
description="NF Compose package",
Expand Down
12 changes: 6 additions & 6 deletions deploy/local/compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ services:
restart: unless-stopped

nfcomposeskipper:
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
networks:
postgres:
nfcompose:
Expand All @@ -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.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
networks:
postgres:
nfcompose:
Expand All @@ -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.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
networks:
- postgres
- nfcompose
Expand All @@ -104,7 +104,7 @@ services:
restart: unless-stopped

nfcompose_skipper_celery_beat:
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
networks:
- postgres
- nfcompose
Expand All @@ -126,7 +126,7 @@ services:
restart: unless-stopped

nfcompose_skipper_task_dashboard:
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
networks:
postgres: {}
nfcompose:
Expand All @@ -144,7 +144,7 @@ services:
restart: unless-stopped

nfcomposeskipperproxy:
image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.13}"
image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.14}"
restart: unless-stopped
depends_on:
- nfcomposeskipper
Expand Down
2 changes: 1 addition & 1 deletion deploy/local/integration/library/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from library.types import JSONType


USER_AGENT = 'integration_test compose 2.2.13'
USER_AGENT = 'integration_test compose 2.2.14'


class APIClient(abc.ABC):
Expand Down
16 changes: 8 additions & 8 deletions deploy/production/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ services:
- "nodered.local"

consumer_gateway:
image: "${SKIPPER_CONSUMER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.2.13}"
image: "${SKIPPER_CONSUMER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.2.14}"
restart: unless-stopped
networks:
postgres:
Expand All @@ -171,7 +171,7 @@ services:
start_period: 1s

skipper:
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
restart: unless-stopped
networks:
postgres:
Expand All @@ -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.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
restart: unless-stopped
networks:
postgres:
Expand All @@ -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.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
restart: unless-stopped
networks:
- postgres
Expand All @@ -216,7 +216,7 @@ services:
SKIPPER_CONTAINER_TYPE: "CELERY"

skipper_celery_beat:
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
restart: unless-stopped
networks:
- postgres
Expand All @@ -227,7 +227,7 @@ services:
SKIPPER_CONTAINER_TYPE: "CELERY_BEAT"

skipper_task_dashboard:
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
restart: unless-stopped
networks:
postgres: {}
Expand All @@ -239,7 +239,7 @@ services:
SKIPPER_CONTAINER_TYPE: "TASK_DASHBOARD"

skipper_proxy:
image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.13}"
image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.14}"
environment:
SKIPPER_BACKEND_SERVICE: "skipper.local"
SKIPPER_BACKEND_SERVICE_PORT: "8000"
Expand Down Expand Up @@ -283,7 +283,7 @@ services:
python manage.py collectstatic --noinput
check_result "failed to collect static files"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.13}"
image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.14}"
environment:
# force rerun everytime
DEPLOY_DATE: "${DEPLOY_DATE}"
Expand Down

0 comments on commit cffd65a

Please sign in to comment.