diff --git a/packages/postgres-database/scripts/erd/Dockerfile b/packages/postgres-database/scripts/erd/Dockerfile index e3cf5d19c91..855ba38136b 100644 --- a/packages/postgres-database/scripts/erd/Dockerfile +++ b/packages/postgres-database/scripts/erd/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base RUN apt-get update \ && apt-get -y install --no-install-recommends\ diff --git a/packages/postgres-database/scripts/erd/Makefile b/packages/postgres-database/scripts/erd/Makefile index 1e781a30b77..c4adb54d2cb 100644 --- a/packages/postgres-database/scripts/erd/Makefile +++ b/packages/postgres-database/scripts/erd/Makefile @@ -3,7 +3,7 @@ # .DEFAULT_GOAL := help -PYTHON_VERSION=3.10.10 +PYTHON_VERSION=3.10.14 # locations REPODIR := $(shell git rev-parse --show-toplevel) diff --git a/packages/postgres-database/tests/docker-compose.prod.yml b/packages/postgres-database/tests/docker-compose.prod.yml index a35f7fb0fe1..cb0c8ffbe53 100644 --- a/packages/postgres-database/tests/docker-compose.prod.yml +++ b/packages/postgres-database/tests/docker-compose.prod.yml @@ -1,4 +1,3 @@ -version: "3.8" services: postgres: volumes: diff --git a/packages/postgres-database/tests/docker-compose.yml b/packages/postgres-database/tests/docker-compose.yml index 45f45b235de..cfaa1c2b9ba 100644 --- a/packages/postgres-database/tests/docker-compose.yml +++ b/packages/postgres-database/tests/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.8" services: postgres: image: "postgres:14.8-alpine@sha256:150dd39ccb7ae6c7ba6130c3582c39a30bb5d3d22cb08ad0ba37001e3f829abc" diff --git a/packages/service-integration/Dockerfile b/packages/service-integration/Dockerfile index a2b55364427..0a45be3b4c4 100644 --- a/packages/service-integration/Dockerfile +++ b/packages/service-integration/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base LABEL maintainer=pcrespov diff --git a/packages/service-library/tests/aiohttp/with_postgres/docker-compose.yml b/packages/service-library/tests/aiohttp/with_postgres/docker-compose.yml index bb5e2785a39..22ebab6fa0c 100644 --- a/packages/service-library/tests/aiohttp/with_postgres/docker-compose.yml +++ b/packages/service-library/tests/aiohttp/with_postgres/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.8" services: postgres: image: "postgres:14.8-alpine@sha256:150dd39ccb7ae6c7ba6130c3582c39a30bb5d3d22cb08ad0ba37001e3f829abc" diff --git a/packages/settings-library/tests/test_application.py b/packages/settings-library/tests/test_application.py index e2a3c35f01d..8447a253a21 100644 --- a/packages/settings-library/tests/test_application.py +++ b/packages/settings-library/tests/test_application.py @@ -17,7 +17,7 @@ def envs_from_docker_inspect() -> EnvVarsDict: "PATH=/home/scu/.venv/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "LANG=C.UTF-8", "GPG_KEY=A035C8C19219BA821ECEA86B64E628F8D684696D", - "PYTHON_VERSION=3.10.10", + "PYTHON_VERSION=3.10.14", "PYTHON_PIP_VERSION=22.3.1", "PYTHON_SETUPTOOLS_VERSION=65.5.1", "PYTHON_GET_PIP_URL=https://github.com/pypa/get-pip/raw/d5cb0afaf23b8520f1bbcfed521017b4a95f5c01/public/get-pip.py", diff --git a/requirements/how-to-upgrade-python.md b/requirements/how-to-upgrade-python.md index 27278c27397..90aaa6e1ef7 100644 --- a/requirements/how-to-upgrade-python.md +++ b/requirements/how-to-upgrade-python.md @@ -15,7 +15,7 @@ Both python and pip version are specified: - in the services/scripts ``Dockerfile``: ```Dockerfile ARG PYTHON_VERSION="3.9.12" - FROM python:${PYTHON_VERSION}-slim-buster as base + FROM python:${PYTHON_VERSION}-slim-bookworm as base ``` - in the CI ``.github/workflows/ci-testing-deploy.yml`` ```yaml diff --git a/requirements/tools/Dockerfile b/requirements/tools/Dockerfile index a35a9d33e55..64669258193 100644 --- a/requirements/tools/Dockerfile +++ b/requirements/tools/Dockerfile @@ -8,8 +8,8 @@ # - Can be installed with pyenv (SEE pyenv install --list ) # # -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base ENV VIRTUAL_ENV=/home/scu/.venv diff --git a/requirements/tools/Makefile b/requirements/tools/Makefile index e1dd0c246ef..8a39071579d 100644 --- a/requirements/tools/Makefile +++ b/requirements/tools/Makefile @@ -14,7 +14,7 @@ # .DEFAULT_GOAL := help -PYTHON_VERSION=3.10.10 +PYTHON_VERSION=3.10.14 # locations REPODIR := $(shell git rev-parse --show-toplevel) diff --git a/scripts/apt-packages-versions/Dockerfile b/scripts/apt-packages-versions/Dockerfile index 6a064320f79..c7c1724982e 100644 --- a/scripts/apt-packages-versions/Dockerfile +++ b/scripts/apt-packages-versions/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base RUN \ apt-get update && \ diff --git a/scripts/erd/Dockerfile b/scripts/erd/Dockerfile index 85fb18785d7..887ab055368 100644 --- a/scripts/erd/Dockerfile +++ b/scripts/erd/Dockerfile @@ -7,8 +7,8 @@ # - https://erdantic.drivendata.org/stable/ # -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base RUN apt-get update \ && apt-get -y install --no-install-recommends\ diff --git a/scripts/maintenance/migrate_project/Dockerfile b/scripts/maintenance/migrate_project/Dockerfile index bdef0d4c326..72afc85d823 100644 --- a/scripts/maintenance/migrate_project/Dockerfile +++ b/scripts/maintenance/migrate_project/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM python:3.10.10-buster +FROM python:3.10.14-buster RUN curl https://rclone.org/install.sh | bash && \ rclone --version diff --git a/scripts/mypy/Dockerfile b/scripts/mypy/Dockerfile index 72fff2f9eec..06a82234250 100644 --- a/scripts/mypy/Dockerfile +++ b/scripts/mypy/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base COPY requirements.txt /requirements.txt diff --git a/scripts/openapi-pydantic-models-generator.bash b/scripts/openapi-pydantic-models-generator.bash index 3553bb9c561..9264a06b48c 100755 --- a/scripts/openapi-pydantic-models-generator.bash +++ b/scripts/openapi-pydantic-models-generator.bash @@ -6,13 +6,11 @@ set -o nounset set -o pipefail IFS=$'\n\t' -PYTHON_VERSION=3.10.10 +PYTHON_VERSION=3.10.14 IMAGE_NAME="local/datamodel-code-generator:${PYTHON_VERSION}" WORKDIR="$(pwd)" - -Build() -{ +Build() { docker buildx build \ --build-arg PYTHON_VERSION="${PYTHON_VERSION}" \ --build-arg HOME_DIR="/home/$USER" \ @@ -35,9 +33,7 @@ ENTRYPOINT ["datamodel-codegen", \ EOF } - -Run() -{ +Run() { docker run \ -it \ --workdir="/home/$USER/workdir" \ @@ -50,8 +46,7 @@ Run() } -Help() -{ +Help() { echo "Please check https://koxudaxi.github.io/datamodel-code-generator/ for help on usage" } diff --git a/scripts/pydeps-docker/Dockerfile b/scripts/pydeps-docker/Dockerfile index 8de828680e1..80c5777957a 100644 --- a/scripts/pydeps-docker/Dockerfile +++ b/scripts/pydeps-docker/Dockerfile @@ -8,8 +8,8 @@ # - Can be installed with pyenv (SEE pyenv install --list ) # # -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base RUN apt-get update \ diff --git a/scripts/pydeps.bash b/scripts/pydeps.bash index 18fcce0a469..affd21597d7 100755 --- a/scripts/pydeps.bash +++ b/scripts/pydeps.bash @@ -7,14 +7,12 @@ set -o nounset set -o pipefail IFS=$'\n\t' -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -PYTHON_VERSION=3.10.10 +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) +PYTHON_VERSION=3.10.14 IMAGE_NAME="local/pydeps-devkit:${PYTHON_VERSION}" WORKDIR="$(pwd)" - -Build() -{ +Build() { docker buildx build \ --load \ --build-arg PYTHON_VERSION="${PYTHON_VERSION}" \ @@ -23,9 +21,7 @@ Build() "$SCRIPT_DIR/pydeps-docker" } - -Run() -{ +Run() { docker run \ -it \ --workdir="/home/$USER/workdir" \ diff --git a/scripts/pyupgrade.bash b/scripts/pyupgrade.bash index cb4420d6d3d..9a775686db3 100755 --- a/scripts/pyupgrade.bash +++ b/scripts/pyupgrade.bash @@ -8,7 +8,7 @@ IFS=$'\n\t' # # # NOTE: check --py* flag in CLI when PYTHON_VERSION is modified -PYTHON_VERSION=3.10.10 +PYTHON_VERSION=3.10.14 IMAGE_NAME="local/pyupgrade-devkit:${PYTHON_VERSION}" WORKDIR="$(pwd)" @@ -18,7 +18,7 @@ Build() { --build-arg HOME_DIR="/home/$USER" \ --tag "$IMAGE_NAME" \ - < /docker-pull.compose.yml" " && " 'echo "#!/bin/sh\necho Pulling started at \\$(date)\ndocker compose --project-name=autoscaleprepull --file=/docker-pull.compose.yml pull --ignore-pull-failures" > /docker-pull-script.sh' diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile index e7af8ae1712..ed5270c29b3 100644 --- a/services/catalog/Dockerfile +++ b/services/catalog/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # # USAGE: diff --git a/services/clusters-keeper/Dockerfile b/services/clusters-keeper/Dockerfile index f230abb4300..8a9fbc27f53 100644 --- a/services/clusters-keeper/Dockerfile +++ b/services/clusters-keeper/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: @@ -13,7 +13,7 @@ FROM python:${PYTHON_VERSION}-slim-buster as base LABEL maintainer=sanderegg # NOTE: to list the latest version run `make` inside `scripts/apt-packages-versions` -ENV DOCKER_APT_VERSION="5:24.0.5-1~debian.10~buster" +ENV DOCKER_APT_VERSION="5:26.1.4-1~debian.12~bookworm" # for docker apt caching to work this needs to be added: [https://vsupalov.com/buildkit-cache-mount-dockerfile/] RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ diff --git a/services/clusters-keeper/src/simcore_service_clusters_keeper/data/docker-compose.yml b/services/clusters-keeper/src/simcore_service_clusters_keeper/data/docker-compose.yml index a5b24f37cef..fb9dff64131 100644 --- a/services/clusters-keeper/src/simcore_service_clusters_keeper/data/docker-compose.yml +++ b/services/clusters-keeper/src/simcore_service_clusters_keeper/data/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.8" services: dask-scheduler: image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG} diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile index fbfebce397d..3400eaa414e 100644 --- a/services/dask-sidecar/Dockerfile +++ b/services/dask-sidecar/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-bookworm as base ARG TARGETPLATFORM ARG BUILDPLATFORM RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile index 13344b74cf1..f6c693651d0 100644 --- a/services/datcore-adapter/Dockerfile +++ b/services/datcore-adapter/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile index cb88ac688ed..1b74d8031ef 100644 --- a/services/director-v2/Dockerfile +++ b/services/director-v2/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: diff --git a/services/director-v2/docker-compose-extra.yml b/services/director-v2/docker-compose-extra.yml index 835409c3775..a997c7eab6a 100644 --- a/services/director-v2/docker-compose-extra.yml +++ b/services/director-v2/docker-compose-extra.yml @@ -1,4 +1,3 @@ -version: "3.8" services: postgres: image: postgres:14.5-alpine@sha256:db802f226b620fc0b8adbeca7859eb203c8d3c9ce5d84870fadee05dea8f50ce diff --git a/services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py b/services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py index d157ca70f32..3efdee495e7 100644 --- a/services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py +++ b/services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py @@ -30,7 +30,7 @@ class DynamicServicesSchedulerSettings(BaseCustomSettings): ) DYNAMIC_SIDECAR_DOCKER_COMPOSE_VERSION: str = Field( - "3.8", description="docker-compose spec version used in the compose-specs" + "3.8", description="docker-compose spec version used in the compose-specs", deprecated=True ) DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS: bool = Field( diff --git a/services/docker-compose-build.yml b/services/docker-compose-build.yml index e51ca8dbd7b..df66ec7a41c 100644 --- a/services/docker-compose-build.yml +++ b/services/docker-compose-build.yml @@ -9,7 +9,6 @@ # # NOTE: the dask-scheduler uses the same image as the dask-sidecar. there is no need to build it twice! # -version: "3.8" services: service-integration: image: local/service-integration:${BUILD_TARGET:?build_target_required} diff --git a/services/docker-compose-deploy.yml b/services/docker-compose-deploy.yml index f8e306b0ed2..a35002e47cb 100644 --- a/services/docker-compose-deploy.yml +++ b/services/docker-compose-deploy.yml @@ -1,5 +1,3 @@ -version: '3.8' -services: agent: image: ${DOCKER_REGISTRY:-itisfoundation}/agent:${DOCKER_IMAGE_TAG:-latest} api-server: diff --git a/services/docker-compose-ops-ci.yml b/services/docker-compose-ops-ci.yml index f2a244ba4f4..4edaf691488 100644 --- a/services/docker-compose-ops-ci.yml +++ b/services/docker-compose-ops-ci.yml @@ -17,7 +17,6 @@ # # NOTE: this stack cannot be called tools because it collides with default network created in services/static-webserver/client/tools/docker-compose.yml # IMPORTANT: This stack IS NOT used in the deployed version -version: "3.8" services: minio: diff --git a/services/docker-compose-ops.yml b/services/docker-compose-ops.yml index 4c6398e454a..ff4949f9c43 100644 --- a/services/docker-compose-ops.yml +++ b/services/docker-compose-ops.yml @@ -17,7 +17,6 @@ # # NOTE: this stack cannot be called tools because it collides with default network created in services/static-webserver/client/tools/docker-compose.yml # IMPORTANT: This stack IS NOT used in the deployed version -version: "3.8" services: adminer: diff --git a/services/docker-compose.devel-frontend.yml b/services/docker-compose.devel-frontend.yml index f662d567a65..bea76b28d7e 100644 --- a/services/docker-compose.devel-frontend.yml +++ b/services/docker-compose.devel-frontend.yml @@ -1,6 +1,5 @@ # This gets used only after services/docker-compose.local.yml and overrides the definition of # the static-webserver to be the only one running the dev image -version: "3.8" services: static-webserver: image: ${DOCKER_REGISTRY:-itisfoundation}/static-webserver:development diff --git a/services/docker-compose.devel.yml b/services/docker-compose.devel.yml index 840497e81e3..542d9afa046 100644 --- a/services/docker-compose.devel.yml +++ b/services/docker-compose.devel.yml @@ -3,7 +3,6 @@ # NOTES: # - port 3000 used for ptsv # -version: "3.8" x-common-environment: &common-environment # Enforces *_DEBUG option in all services. ONLY allowed in devel-mode! DEBUG : "true" diff --git a/services/docker-compose.local.yml b/services/docker-compose.local.yml index b5859000ddb..2ba2aa37a2d 100644 --- a/services/docker-compose.local.yml +++ b/services/docker-compose.local.yml @@ -10,7 +10,6 @@ # - debug mode can be activated if SC_BOOT_MODE=debug-ptvsd (this is the default in devel). # - use vscode debugger "Python: Remote Attach *" config in ''.vscode-template/launch.json' # -version: "3.8" x-common-environment: &common_environment SWARM_STACK_NAME : ${SWARM_STACK_NAME:-simcore_local} services: diff --git a/services/docker-compose.yml b/services/docker-compose.yml index 63f2cbfc8da..513224158c4 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.8" x-dask-tls-secrets: &dask_tls_secrets - source: dask_tls_key target: ${DASK_TLS_KEY} diff --git a/services/dynamic-scheduler/Dockerfile b/services/dynamic-scheduler/Dockerfile index 3cddd1080c8..f250232d1df 100644 --- a/services/dynamic-scheduler/Dockerfile +++ b/services/dynamic-scheduler/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: diff --git a/services/dynamic-sidecar/Dockerfile b/services/dynamic-sidecar/Dockerfile index 47b12160f03..0a6e223040f 100644 --- a/services/dynamic-sidecar/Dockerfile +++ b/services/dynamic-sidecar/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: # cd sercices/dynamic-sidecar @@ -12,8 +12,8 @@ FROM python:${PYTHON_VERSION}-slim-buster as base LABEL maintainer="Andrei Neagu " # NOTE: to list the latest version run `make` inside `scripts/apt-packages-versions` -ENV DOCKER_APT_VERSION="5:24.0.5-1~debian.10~buster" -ENV DOCKER_COMPOSE_APT_VERSION="2.20.2-1~debian.10~buster" +ENV DOCKER_APT_VERSION="5:26.1.4-1~debian.12~bookworm" +ENV DOCKER_COMPOSE_APT_VERSION="2.27.1-1~debian.12~bookworm" # for docker apt caching to work this needs to be added: [https://vsupalov.com/buildkit-cache-mount-dockerfile/] RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ diff --git a/services/dynamic-sidecar/tests/unit/test_core_docker_compose_utils.py b/services/dynamic-sidecar/tests/unit/test_core_docker_compose_utils.py index c44603b2057..115955a2d89 100644 --- a/services/dynamic-sidecar/tests/unit/test_core_docker_compose_utils.py +++ b/services/dynamic-sidecar/tests/unit/test_core_docker_compose_utils.py @@ -25,7 +25,6 @@ SLEEP_TIME_S = 60 COMPOSE_SPEC_SAMPLE = { - "version": "3.8", "services": { "my-test-container": { "environment": [ diff --git a/services/dynamic-sidecar/tests/unit/test_core_docker_utils.py b/services/dynamic-sidecar/tests/unit/test_core_docker_utils.py index 900d1b2df6e..a7d2254425c 100644 --- a/services/dynamic-sidecar/tests/unit/test_core_docker_utils.py +++ b/services/dynamic-sidecar/tests/unit/test_core_docker_utils.py @@ -133,7 +133,6 @@ async def test_get_running_containers_count_from_names( COMPOSE_SPEC_SAMPLE = { - "version": "3.8", "services": { "my-test-container": { "environment": [ diff --git a/services/dynamic-sidecar/tests/unit/test_core_utils.py b/services/dynamic-sidecar/tests/unit/test_core_utils.py index 1e650ee3c48..76913bc9347 100644 --- a/services/dynamic-sidecar/tests/unit/test_core_utils.py +++ b/services/dynamic-sidecar/tests/unit/test_core_utils.py @@ -17,7 +17,6 @@ def cmd(tmp_path: Path, sleep: int): docker_compose = tmp_path / "docker_compose.yml" docker_compose.write_text( f"""\ -version: "3.8" services: my-container: environment: diff --git a/services/efs-guardian/Dockerfile b/services/efs-guardian/Dockerfile index d1468f443f2..4ab1ab6e8fa 100644 --- a/services/efs-guardian/Dockerfile +++ b/services/efs-guardian/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: @@ -13,7 +13,7 @@ FROM python:${PYTHON_VERSION}-slim-buster as base LABEL maintainer=sanderegg # NOTE: to list the latest version run `make` inside `scripts/apt-packages-versions` -ENV DOCKER_APT_VERSION="5:24.0.5-1~debian.10~buster" +ENV DOCKER_APT_VERSION="5:26.1.4-1~debian.12~bookworm" # for docker apt caching to work this needs to be added: [https://vsupalov.com/buildkit-cache-mount-dockerfile/] RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ diff --git a/services/invitations/Dockerfile b/services/invitations/Dockerfile index f511098eba3..5e96ede97e0 100644 --- a/services/invitations/Dockerfile +++ b/services/invitations/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile index bf015cea668..c40a4fd1dff 100644 --- a/services/migration/Dockerfile +++ b/services/migration/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base LABEL maintainer=sanderegg diff --git a/services/osparc-gateway-server/Dockerfile b/services/osparc-gateway-server/Dockerfile index dd040f4bf4e..f5e9ff32d93 100644 --- a/services/osparc-gateway-server/Dockerfile +++ b/services/osparc-gateway-server/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" +ARG PYTHON_VERSION="3.10.14" FROM python:${PYTHON_VERSION}-slim-bullseye as base ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/services/payments/Dockerfile b/services/payments/Dockerfile index 692e6034022..e4ba13fe8f0 100644 --- a/services/payments/Dockerfile +++ b/services/payments/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: diff --git a/services/resource-usage-tracker/Dockerfile b/services/resource-usage-tracker/Dockerfile index 5af3d0add5e..459025da7f6 100644 --- a/services/resource-usage-tracker/Dockerfile +++ b/services/resource-usage-tracker/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: diff --git a/services/static-webserver/client/tools/docker-compose.yml b/services/static-webserver/client/tools/docker-compose.yml index 88cfbdeb7cd..c0533894c61 100644 --- a/services/static-webserver/client/tools/docker-compose.yml +++ b/services/static-webserver/client/tools/docker-compose.yml @@ -1,7 +1,6 @@ # # Used in development to compile source code using a running qooxdoo-kit container # -version: "3.8" services: qooxdoo-kit: image: itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG} diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile index 72ceb513efb..b2e26143008 100644 --- a/services/storage/Dockerfile +++ b/services/storage/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: # cd sercices/storage diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 55dd0dd8229..9cefb777a8c 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.10.10" -FROM python:${PYTHON_VERSION}-slim-buster as base +ARG PYTHON_VERSION="3.10.14" +FROM python:${PYTHON_VERSION}-slim-bookworm as base # # USAGE: # cd sercices/web diff --git a/services/web/server/tests/unit/isolated/test_application_settings.py b/services/web/server/tests/unit/isolated/test_application_settings.py index 1b6e713cd4c..c97ff2a59b0 100644 --- a/services/web/server/tests/unit/isolated/test_application_settings.py +++ b/services/web/server/tests/unit/isolated/test_application_settings.py @@ -78,7 +78,7 @@ def mock_env_dockerfile_build(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict: PYTHON_GET_PIP_SHA256=6123659241292b2147b58922b9ffe11dda66b39d52d8a6f3aa310bc1d60ea6f7 PYTHON_GET_PIP_URL=https://github.com/pypa/get-pip/raw/a1675ab6c2bd898ed82b1f58c486097f763c74a9/public/get-pip.py PYTHON_PIP_VERSION=21.1.3 - PYTHON_VERSION=3.10.10 + PYTHON_VERSION=3.10.14 PYTHONDONTWRITEBYTECODE=1 PYTHONOPTIMIZE=TRUE SC_BOOT_MODE=production diff --git a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml index 4437016287f..fb82b3be2da 100644 --- a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml +++ b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml @@ -1,4 +1,3 @@ -version: "3.8" services: postgres: image: "postgres:14.8-alpine@sha256:150dd39ccb7ae6c7ba6130c3582c39a30bb5d3d22cb08ad0ba37001e3f829abc" diff --git a/services/web/server/tests/unit/with_dbs/docker-compose.yml b/services/web/server/tests/unit/with_dbs/docker-compose.yml index 0ed34d0fa51..dc57db07383 100644 --- a/services/web/server/tests/unit/with_dbs/docker-compose.yml +++ b/services/web/server/tests/unit/with_dbs/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.8" services: postgres: image: "postgres:14.8-alpine@sha256:150dd39ccb7ae6c7ba6130c3582c39a30bb5d3d22cb08ad0ba37001e3f829abc" diff --git a/tests/e2e/docker-compose.yml b/tests/e2e/docker-compose.yml index 549c43a0ac0..245eb07482b 100644 --- a/tests/e2e/docker-compose.yml +++ b/tests/e2e/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.8" services: registry: image: registry:2 diff --git a/tests/environment-setup/test_used_docker_compose.py b/tests/environment-setup/test_used_docker_compose.py index 08066b771d0..946da61d569 100644 --- a/tests/environment-setup/test_used_docker_compose.py +++ b/tests/environment-setup/test_used_docker_compose.py @@ -113,9 +113,7 @@ def test_validate_compose_file( ): assert compose_path.exists() compose = yaml.safe_load(compose_path.read_text()) - print( - str(compose_path.relative_to(repo_dir)), "-> version=", compose.get("version") - ) + print(str(compose_path.relative_to(repo_dir))) # NOTE: with docker stack config, the .env file MUST be alongside the docker-compose file @@ -134,4 +132,4 @@ def test_validate_compose_file( ) # About versioning https://docs.docker.com/compose/compose-file/compose-file-v3/ - assert compose["version"] == "3.8" + assert "version" not in compose diff --git a/tests/performance/docker-compose.yml b/tests/performance/docker-compose.yml index 2aeed2782fc..2623454210e 100644 --- a/tests/performance/docker-compose.yml +++ b/tests/performance/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: master: image: itisfoundation/locust:${LOCUST_VERSION}