diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 2dd530e23fb..c3ed0e351ab 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -22,8 +22,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: # ensure the docker_compose_sha corresponds to the the version!! diff --git a/.github/workflows/ci-staging.yml b/.github/workflows/ci-staging.yml index 2877c7bbaf0..d3d86d4a408 100644 --- a/.github/workflows/ci-staging.yml +++ b/.github/workflows/ci-staging.yml @@ -22,8 +22,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index 3182667b000..93ce339bd3b 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -187,8 +187,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -229,8 +229,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -273,8 +273,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -315,8 +315,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -357,8 +357,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -399,8 +399,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -446,8 +446,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -485,8 +485,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -527,8 +527,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -572,8 +572,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -620,8 +620,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -671,9 +671,10 @@ jobs: strategy: matrix: # KEEP 3.6 Development of this service is frozen + # KEEP ubuntu 20.04, else no python 3.6 python: [3.6] os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -714,8 +715,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -762,8 +763,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -807,8 +808,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -851,8 +852,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -905,8 +906,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -950,8 +951,8 @@ jobs: strategy: matrix: node: [14] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -991,8 +992,8 @@ jobs: strategy: matrix: python: ["3.9", "3.10", "3.11"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1030,8 +1031,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1075,8 +1076,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1120,8 +1121,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1162,8 +1163,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1204,8 +1205,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1246,8 +1247,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1288,8 +1289,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1374,8 +1375,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1432,8 +1433,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1492,8 +1493,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1552,8 +1553,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1615,8 +1616,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1690,8 +1691,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1773,8 +1774,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1830,8 +1831,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1895,8 +1896,8 @@ jobs: matrix: python: ["3.9"] node: [14] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -1971,8 +1972,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 @@ -2033,8 +2034,8 @@ jobs: strategy: matrix: python: ["3.9"] - os: [ubuntu-20.04] - docker_buildx: [v0.8.2] + os: [ubuntu-22.04] + docker_buildx: [v0.10.2] docker_compose: [1.29.1] include: - docker_compose: 1.29.1 diff --git a/ci/github/helpers/install_rclone_docker_volume_plugin.bash b/ci/github/helpers/install_rclone_docker_volume_plugin.bash index 23f1968b027..c81109892f3 100755 --- a/ci/github/helpers/install_rclone_docker_volume_plugin.bash +++ b/ci/github/helpers/install_rclone_docker_volume_plugin.bash @@ -11,10 +11,9 @@ IFS=$'\n\t' # Installation instructions from https://rclone.org/docker/ - -apt-get -y install fuse=2.9.9-3 +R_CLONE_VERSION="1.62.1" mkdir --parents /var/lib/docker-plugins/rclone/config mkdir --parents /var/lib/docker-plugins/rclone/cache -docker plugin install rclone/docker-volume-rclone:amd64-1.57.0 args="-v" --alias rclone --grant-all-permissions +docker plugin install rclone/docker-volume-rclone:amd64-${R_CLONE_VERSION} args="-v" --alias rclone --grant-all-permissions docker plugin list docker plugin inspect rclone diff --git a/scripts/install_rclone.bash b/scripts/install_rclone.bash index 66f6a3ec83a..028753aef2b 100755 --- a/scripts/install_rclone.bash +++ b/scripts/install_rclone.bash @@ -10,7 +10,7 @@ set -o pipefail # don't hide errors within pipes IFS=$'\n\t' -R_CLONE_VERSION="1.58.0" +R_CLONE_VERSION="1.62.1" curl --silent --location --remote-name "https://downloads.rclone.org/v${R_CLONE_VERSION}/rclone-v${R_CLONE_VERSION}-linux-amd64.deb" dpkg --install "rclone-v${R_CLONE_VERSION}-linux-amd64.deb" rm "rclone-v${R_CLONE_VERSION}-linux-amd64.deb" diff --git a/services/docker-compose.yml b/services/docker-compose.yml index a7b09b11320..f7bc10373fd 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -575,6 +575,7 @@ services: # retries: 3 # start_period: 20s + volumes: postgres_data: name: ${SWARM_STACK_NAME}_postgres_data