From 27c3fdb0af363666e2e9bed6ae924fa0872ef912 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 16 Feb 2024 11:50:30 +0300 Subject: [PATCH 1/7] Sync requirements.txt for all images --- .../files/etc/requirements.txt | 43 ++++++------- .../failtester/files/etc/requirements.txt | 43 ++++++------- .../files/etc/requirements.txt | 43 ++++++------- .../stylechecker/files/etc/requirements.txt | 61 ++++++++++--------- 4 files changed, 97 insertions(+), 93 deletions(-) diff --git a/circleci/images/citusupgradetester/files/etc/requirements.txt b/circleci/images/citusupgradetester/files/etc/requirements.txt index 2d6c18f..eacce81 100644 --- a/circleci/images/citusupgradetester/files/etc/requirements.txt +++ b/circleci/images/citusupgradetester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111 +# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491 # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image @@ -6,15 +6,15 @@ asgiref==3.4.1; python_version >= '3.6' blinker==1.4 brotli==1.0.9 -certifi==2023.7.22; python_version >= '3.6' -cffi==1.15.1 +certifi==2024.2.2; python_version >= '3.6' +cffi==1.16.0; platform_python_implementation != 'PyPy' click==8.0.4; python_version >= '3.6' construct==2.9.45 -cryptography==41.0.4; python_version >= '3.7' +cryptography==42.0.3; python_version >= '3.7' docopt==0.6.2 -exceptiongroup==1.1.3; python_version < '3.11' +exceptiongroup==1.2.0; python_version < '3.11' execnet==2.0.2; python_version >= '3.7' -filelock==3.12.4; python_version >= '3.8' +filelock==3.13.1; python_version >= '3.8' flask==2.0.3; python_version >= '3.6' h11==0.12.0; python_version >= '3.6' h2==4.1.0; python_full_version >= '3.6.1' @@ -22,34 +22,35 @@ hpack==4.0.0; python_full_version >= '3.6.1' hyperframe==6.0.1; python_full_version >= '3.6.1' iniconfig==2.0.0; python_version >= '3.7' itsdangerous==2.1.2; python_version >= '3.7' -jinja2==3.1.2; python_version >= '3.7' +jinja2==3.1.3; python_version >= '3.7' kaitaistruct==0.9 ldap3==2.9.1 -markupsafe==2.1.3; python_version >= '3.7' +markupsafe==2.1.5; python_version >= '3.7' -e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy -msgpack==1.0.6; python_version >= '3.8' -packaging==23.1; python_version >= '3.7' +msgpack==1.0.7; python_version >= '3.8' +packaging==23.2; python_version >= '3.7' passlib==1.7.4 -pluggy==1.3.0; python_version >= '3.8' +pluggy==1.4.0; python_version >= '3.8' protobuf==3.18.3; python_version >= '3.5' -psycopg==3.1.11; python_version >= '3.7' +psycopg==3.1.18; python_version >= '3.7' publicsuffix2==2.20191221 -pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' +pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' pycparser==2.21 -pyopenssl==23.2.0; python_version >= '3.6' +pyopenssl==24.0.0; python_version >= '3.7' pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pyperclip==1.8.2 -pytest==7.4.2; python_version >= '3.7' -pytest-asyncio==0.21.1; python_version >= '3.7' -pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -pytest-timeout==2.1.0; python_version >= '3.6' -pytest-xdist==3.3.1; python_version >= '3.7' +pytest==8.0.0; python_version >= '3.8' +pytest-asyncio==0.23.5; python_version >= '3.8' +pytest-repeat==0.9.3; python_version >= '3.7' +pytest-timeout==2.2.0; python_version >= '3.7' +pytest-xdist==3.5.0; python_version >= '3.7' pyyaml==6.0.1; python_version >= '3.6' ruamel.yaml==0.17.16; python_version >= '3' +ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython' sortedcontainers==2.4.0 tomli==2.0.1; python_version < '3.11' -tornado==6.3.3; python_version >= '3.8' -typing-extensions==4.8.0; python_version >= '3.8' +tornado==6.4; python_version >= '3.8' +typing-extensions==4.9.0; python_version >= '3.8' urwid==2.1.2 werkzeug==2.3.7; python_version >= '3.8' wsproto==1.0.0; python_full_version >= '3.6.1' diff --git a/circleci/images/failtester/files/etc/requirements.txt b/circleci/images/failtester/files/etc/requirements.txt index 2d6c18f..eacce81 100644 --- a/circleci/images/failtester/files/etc/requirements.txt +++ b/circleci/images/failtester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111 +# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491 # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image @@ -6,15 +6,15 @@ asgiref==3.4.1; python_version >= '3.6' blinker==1.4 brotli==1.0.9 -certifi==2023.7.22; python_version >= '3.6' -cffi==1.15.1 +certifi==2024.2.2; python_version >= '3.6' +cffi==1.16.0; platform_python_implementation != 'PyPy' click==8.0.4; python_version >= '3.6' construct==2.9.45 -cryptography==41.0.4; python_version >= '3.7' +cryptography==42.0.3; python_version >= '3.7' docopt==0.6.2 -exceptiongroup==1.1.3; python_version < '3.11' +exceptiongroup==1.2.0; python_version < '3.11' execnet==2.0.2; python_version >= '3.7' -filelock==3.12.4; python_version >= '3.8' +filelock==3.13.1; python_version >= '3.8' flask==2.0.3; python_version >= '3.6' h11==0.12.0; python_version >= '3.6' h2==4.1.0; python_full_version >= '3.6.1' @@ -22,34 +22,35 @@ hpack==4.0.0; python_full_version >= '3.6.1' hyperframe==6.0.1; python_full_version >= '3.6.1' iniconfig==2.0.0; python_version >= '3.7' itsdangerous==2.1.2; python_version >= '3.7' -jinja2==3.1.2; python_version >= '3.7' +jinja2==3.1.3; python_version >= '3.7' kaitaistruct==0.9 ldap3==2.9.1 -markupsafe==2.1.3; python_version >= '3.7' +markupsafe==2.1.5; python_version >= '3.7' -e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy -msgpack==1.0.6; python_version >= '3.8' -packaging==23.1; python_version >= '3.7' +msgpack==1.0.7; python_version >= '3.8' +packaging==23.2; python_version >= '3.7' passlib==1.7.4 -pluggy==1.3.0; python_version >= '3.8' +pluggy==1.4.0; python_version >= '3.8' protobuf==3.18.3; python_version >= '3.5' -psycopg==3.1.11; python_version >= '3.7' +psycopg==3.1.18; python_version >= '3.7' publicsuffix2==2.20191221 -pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' +pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' pycparser==2.21 -pyopenssl==23.2.0; python_version >= '3.6' +pyopenssl==24.0.0; python_version >= '3.7' pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pyperclip==1.8.2 -pytest==7.4.2; python_version >= '3.7' -pytest-asyncio==0.21.1; python_version >= '3.7' -pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -pytest-timeout==2.1.0; python_version >= '3.6' -pytest-xdist==3.3.1; python_version >= '3.7' +pytest==8.0.0; python_version >= '3.8' +pytest-asyncio==0.23.5; python_version >= '3.8' +pytest-repeat==0.9.3; python_version >= '3.7' +pytest-timeout==2.2.0; python_version >= '3.7' +pytest-xdist==3.5.0; python_version >= '3.7' pyyaml==6.0.1; python_version >= '3.6' ruamel.yaml==0.17.16; python_version >= '3' +ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython' sortedcontainers==2.4.0 tomli==2.0.1; python_version < '3.11' -tornado==6.3.3; python_version >= '3.8' -typing-extensions==4.8.0; python_version >= '3.8' +tornado==6.4; python_version >= '3.8' +typing-extensions==4.9.0; python_version >= '3.8' urwid==2.1.2 werkzeug==2.3.7; python_version >= '3.8' wsproto==1.0.0; python_full_version >= '3.6.1' diff --git a/circleci/images/pgupgradetester/files/etc/requirements.txt b/circleci/images/pgupgradetester/files/etc/requirements.txt index 2d6c18f..eacce81 100644 --- a/circleci/images/pgupgradetester/files/etc/requirements.txt +++ b/circleci/images/pgupgradetester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111 +# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491 # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image @@ -6,15 +6,15 @@ asgiref==3.4.1; python_version >= '3.6' blinker==1.4 brotli==1.0.9 -certifi==2023.7.22; python_version >= '3.6' -cffi==1.15.1 +certifi==2024.2.2; python_version >= '3.6' +cffi==1.16.0; platform_python_implementation != 'PyPy' click==8.0.4; python_version >= '3.6' construct==2.9.45 -cryptography==41.0.4; python_version >= '3.7' +cryptography==42.0.3; python_version >= '3.7' docopt==0.6.2 -exceptiongroup==1.1.3; python_version < '3.11' +exceptiongroup==1.2.0; python_version < '3.11' execnet==2.0.2; python_version >= '3.7' -filelock==3.12.4; python_version >= '3.8' +filelock==3.13.1; python_version >= '3.8' flask==2.0.3; python_version >= '3.6' h11==0.12.0; python_version >= '3.6' h2==4.1.0; python_full_version >= '3.6.1' @@ -22,34 +22,35 @@ hpack==4.0.0; python_full_version >= '3.6.1' hyperframe==6.0.1; python_full_version >= '3.6.1' iniconfig==2.0.0; python_version >= '3.7' itsdangerous==2.1.2; python_version >= '3.7' -jinja2==3.1.2; python_version >= '3.7' +jinja2==3.1.3; python_version >= '3.7' kaitaistruct==0.9 ldap3==2.9.1 -markupsafe==2.1.3; python_version >= '3.7' +markupsafe==2.1.5; python_version >= '3.7' -e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy -msgpack==1.0.6; python_version >= '3.8' -packaging==23.1; python_version >= '3.7' +msgpack==1.0.7; python_version >= '3.8' +packaging==23.2; python_version >= '3.7' passlib==1.7.4 -pluggy==1.3.0; python_version >= '3.8' +pluggy==1.4.0; python_version >= '3.8' protobuf==3.18.3; python_version >= '3.5' -psycopg==3.1.11; python_version >= '3.7' +psycopg==3.1.18; python_version >= '3.7' publicsuffix2==2.20191221 -pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' +pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' pycparser==2.21 -pyopenssl==23.2.0; python_version >= '3.6' +pyopenssl==24.0.0; python_version >= '3.7' pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pyperclip==1.8.2 -pytest==7.4.2; python_version >= '3.7' -pytest-asyncio==0.21.1; python_version >= '3.7' -pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -pytest-timeout==2.1.0; python_version >= '3.6' -pytest-xdist==3.3.1; python_version >= '3.7' +pytest==8.0.0; python_version >= '3.8' +pytest-asyncio==0.23.5; python_version >= '3.8' +pytest-repeat==0.9.3; python_version >= '3.7' +pytest-timeout==2.2.0; python_version >= '3.7' +pytest-xdist==3.5.0; python_version >= '3.7' pyyaml==6.0.1; python_version >= '3.6' ruamel.yaml==0.17.16; python_version >= '3' +ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython' sortedcontainers==2.4.0 tomli==2.0.1; python_version < '3.11' -tornado==6.3.3; python_version >= '3.8' -typing-extensions==4.8.0; python_version >= '3.8' +tornado==6.4; python_version >= '3.8' +typing-extensions==4.9.0; python_version >= '3.8' urwid==2.1.2 werkzeug==2.3.7; python_version >= '3.8' wsproto==1.0.0; python_full_version >= '3.6.1' diff --git a/circleci/images/stylechecker/files/etc/requirements.txt b/circleci/images/stylechecker/files/etc/requirements.txt index 2f96839..1bea9fd 100644 --- a/circleci/images/stylechecker/files/etc/requirements.txt +++ b/circleci/images/stylechecker/files/etc/requirements.txt @@ -1,34 +1,34 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111 +# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491 # using `pipenv requirements --dev > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image -i https://pypi.python.org/simple -attrs==23.1.0; python_version >= '3.7' -black==23.9.1; python_version >= '3.8' +attrs==23.2.0; python_version >= '3.7' +black==24.2.0; python_version >= '3.8' click==8.0.4; python_version >= '3.6' -flake8==6.1.0; python_full_version >= '3.8.1' -flake8-bugbear==23.9.16; python_full_version >= '3.8.1' -isort==5.12.0; python_full_version >= '3.8.0' +flake8==7.0.0; python_full_version >= '3.8.1' +flake8-bugbear==24.2.6; python_full_version >= '3.8.1' +isort==5.13.2; python_full_version >= '3.8.0' mccabe==0.7.0; python_version >= '3.6' mypy-extensions==1.0.0; python_version >= '3.5' -packaging==23.1; python_version >= '3.7' -pathspec==0.11.2; python_version >= '3.7' -platformdirs==3.10.0; python_version >= '3.7' -pycodestyle==2.11.0; python_version >= '3.8' -pyflakes==3.1.0; python_version >= '3.8' +packaging==23.2; python_version >= '3.7' +pathspec==0.12.1; python_version >= '3.8' +platformdirs==4.2.0; python_version >= '3.8' +pycodestyle==2.11.1; python_version >= '3.8' +pyflakes==3.2.0; python_version >= '3.8' tomli==2.0.1; python_version < '3.11' -typing-extensions==4.8.0; python_version >= '3.8' +typing-extensions==4.9.0; python_version >= '3.8' asgiref==3.4.1; python_version >= '3.6' blinker==1.4 brotli==1.0.9 -certifi==2023.7.22; python_version >= '3.6' -cffi==1.15.1 +certifi==2024.2.2; python_version >= '3.6' +cffi==1.16.0; platform_python_implementation != 'PyPy' construct==2.9.45 -cryptography==41.0.4; python_version >= '3.7' +cryptography==42.0.3; python_version >= '3.7' docopt==0.6.2 -exceptiongroup==1.1.3; python_version < '3.11' +exceptiongroup==1.2.0; python_version < '3.11' execnet==2.0.2; python_version >= '3.7' -filelock==3.12.4; python_version >= '3.8' +filelock==3.13.1; python_version >= '3.8' flask==2.0.3; python_version >= '3.6' h11==0.12.0; python_version >= '3.6' h2==4.1.0; python_full_version >= '3.6.1' @@ -36,31 +36,32 @@ hpack==4.0.0; python_full_version >= '3.6.1' hyperframe==6.0.1; python_full_version >= '3.6.1' iniconfig==2.0.0; python_version >= '3.7' itsdangerous==2.1.2; python_version >= '3.7' -jinja2==3.1.2; python_version >= '3.7' +jinja2==3.1.3; python_version >= '3.7' kaitaistruct==0.9 ldap3==2.9.1 -markupsafe==2.1.3; python_version >= '3.7' +markupsafe==2.1.5; python_version >= '3.7' -e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy -msgpack==1.0.6; python_version >= '3.8' +msgpack==1.0.7; python_version >= '3.8' passlib==1.7.4 -pluggy==1.3.0; python_version >= '3.8' +pluggy==1.4.0; python_version >= '3.8' protobuf==3.18.3; python_version >= '3.5' -psycopg==3.1.11; python_version >= '3.7' +psycopg==3.1.18; python_version >= '3.7' publicsuffix2==2.20191221 -pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' +pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' pycparser==2.21 -pyopenssl==23.2.0; python_version >= '3.6' +pyopenssl==24.0.0; python_version >= '3.7' pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pyperclip==1.8.2 -pytest==7.4.2; python_version >= '3.7' -pytest-asyncio==0.21.1; python_version >= '3.7' -pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -pytest-timeout==2.1.0; python_version >= '3.6' -pytest-xdist==3.3.1; python_version >= '3.7' +pytest==8.0.0; python_version >= '3.8' +pytest-asyncio==0.23.5; python_version >= '3.8' +pytest-repeat==0.9.3; python_version >= '3.7' +pytest-timeout==2.2.0; python_version >= '3.7' +pytest-xdist==3.5.0; python_version >= '3.7' pyyaml==6.0.1; python_version >= '3.6' ruamel.yaml==0.17.16; python_version >= '3' +ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython' sortedcontainers==2.4.0 -tornado==6.3.3; python_version >= '3.8' +tornado==6.4; python_version >= '3.8' urwid==2.1.2 werkzeug==2.3.7; python_version >= '3.8' wsproto==1.0.0; python_full_version >= '3.6.1' From 7b24bbd7889209be985620ae2206ef700f373823 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 16 Feb 2024 12:14:51 +0300 Subject: [PATCH 2/7] Bump PG versions to 14.11, 15.6, 16.2 --- circleci/images/PG_VERSIONS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circleci/images/PG_VERSIONS b/circleci/images/PG_VERSIONS index 4ae422c..1ab39fb 100644 --- a/circleci/images/PG_VERSIONS +++ b/circleci/images/PG_VERSIONS @@ -1,3 +1,3 @@ -PG14=14.10 -PG15=15.5 -PG16=16.1 +PG14=14.11 +PG15=15.6 +PG16=16.2 From 5c36cfce8e98b2d5abf94b9307be83adafad67ac Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 16 Feb 2024 12:26:15 +0300 Subject: [PATCH 3/7] Use "--break-system-packages" when installing python packages --- circleci/images/citusupgradetester/Dockerfile | 4 +++- circleci/images/failtester/Dockerfile | 4 +++- circleci/images/pgupgradetester/Dockerfile | 4 +++- circleci/images/stylechecker/Dockerfile | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile index dbc1e55..d051abc 100644 --- a/circleci/images/citusupgradetester/Dockerfile +++ b/circleci/images/citusupgradetester/Dockerfile @@ -96,7 +96,9 @@ FROM base RUN chown -R circleci /usr/lib/postgresql/ /usr/include/postgresql/ /usr/share/postgresql/ COPY ./files/etc/requirements.txt /tmp/etc/ -RUN pip3 install -Ir /tmp/etc/requirements.txt + +# this image is only used for testing purposes, so should be okay to overwrite system-managed packages +RUN pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages WORKDIR /home/circleci diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile index 23f9691..c6973ec 100644 --- a/circleci/images/failtester/Dockerfile +++ b/circleci/images/failtester/Dockerfile @@ -74,6 +74,8 @@ ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql COPY ./files/etc/requirements.txt /tmp/etc/ -RUN pip3 install -Ir /tmp/etc/requirements.txt + +# this image is only used for testing purposes, so should be okay to overwrite system-managed packages +RUN pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages WORKDIR /home/circleci diff --git a/circleci/images/pgupgradetester/Dockerfile b/circleci/images/pgupgradetester/Dockerfile index c78c11f..f688272 100644 --- a/circleci/images/pgupgradetester/Dockerfile +++ b/circleci/images/pgupgradetester/Dockerfile @@ -74,4 +74,6 @@ RUN echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /e RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql COPY ./files/etc/requirements.txt /tmp/etc/ -RUN pip3 install -Ir /tmp/etc/requirements.txt + +# this image is only used for testing purposes, so should be okay to overwrite system-managed packages +RUN pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile index a71d71a..ca2d19f 100644 --- a/circleci/images/stylechecker/Dockerfile +++ b/circleci/images/stylechecker/Dockerfile @@ -38,5 +38,6 @@ RUN apk add --no-cache --virtual installdeps \ && make install \ && cd ../.. \ && rm -rf uncrustify-uncrustify-0.68.1/ \ - && pip3 install -Ir /tmp/etc/requirements.txt \ + # this image is only used for testing purposes, so should be okay to overwrite system-managed packages + && pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages \ && apk del installdeps From 3c3f1e6424572661f8219573d1e48f1ace73e3d1 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 16 Feb 2024 13:24:00 +0300 Subject: [PATCH 4/7] try --- circleci/images/citusupgradetester/Dockerfile | 2 +- circleci/images/failtester/Dockerfile | 2 +- circleci/images/pgupgradetester/Dockerfile | 2 +- circleci/images/stylechecker/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile index d051abc..cba1671 100644 --- a/circleci/images/citusupgradetester/Dockerfile +++ b/circleci/images/citusupgradetester/Dockerfile @@ -98,7 +98,7 @@ RUN chown -R circleci /usr/lib/postgresql/ /usr/include/postgresql/ /usr/share/p COPY ./files/etc/requirements.txt /tmp/etc/ # this image is only used for testing purposes, so should be okay to overwrite system-managed packages -RUN pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages +RUN pip3 install -Ir /tmp/etc/requirements.txt --user WORKDIR /home/circleci diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile index c6973ec..08ee93b 100644 --- a/circleci/images/failtester/Dockerfile +++ b/circleci/images/failtester/Dockerfile @@ -76,6 +76,6 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres COPY ./files/etc/requirements.txt /tmp/etc/ # this image is only used for testing purposes, so should be okay to overwrite system-managed packages -RUN pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages +RUN pip3 install -Ir /tmp/etc/requirements.txt --user WORKDIR /home/circleci diff --git a/circleci/images/pgupgradetester/Dockerfile b/circleci/images/pgupgradetester/Dockerfile index f688272..ac3dd09 100644 --- a/circleci/images/pgupgradetester/Dockerfile +++ b/circleci/images/pgupgradetester/Dockerfile @@ -76,4 +76,4 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres COPY ./files/etc/requirements.txt /tmp/etc/ # this image is only used for testing purposes, so should be okay to overwrite system-managed packages -RUN pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages +RUN pip3 install -Ir /tmp/etc/requirements.txt --user diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile index ca2d19f..c4550fa 100644 --- a/circleci/images/stylechecker/Dockerfile +++ b/circleci/images/stylechecker/Dockerfile @@ -39,5 +39,5 @@ RUN apk add --no-cache --virtual installdeps \ && cd ../.. \ && rm -rf uncrustify-uncrustify-0.68.1/ \ # this image is only used for testing purposes, so should be okay to overwrite system-managed packages - && pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages \ + && pip3 install -Ir /tmp/etc/requirements.txt --user \ && apk del installdeps From cf234548272f74e52849fb4d40c7e0b25f2f5be9 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 16 Feb 2024 13:30:41 +0300 Subject: [PATCH 5/7] try --- circleci/images/citusupgradetester/Dockerfile | 1 - circleci/images/failtester/Dockerfile | 1 - circleci/images/pgupgradetester/Dockerfile | 1 - circleci/images/stylechecker/Dockerfile | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile index cba1671..97b9a8a 100644 --- a/circleci/images/citusupgradetester/Dockerfile +++ b/circleci/images/citusupgradetester/Dockerfile @@ -97,7 +97,6 @@ RUN chown -R circleci /usr/lib/postgresql/ /usr/include/postgresql/ /usr/share/p COPY ./files/etc/requirements.txt /tmp/etc/ -# this image is only used for testing purposes, so should be okay to overwrite system-managed packages RUN pip3 install -Ir /tmp/etc/requirements.txt --user WORKDIR /home/circleci diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile index 08ee93b..10eb62d 100644 --- a/circleci/images/failtester/Dockerfile +++ b/circleci/images/failtester/Dockerfile @@ -75,7 +75,6 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres COPY ./files/etc/requirements.txt /tmp/etc/ -# this image is only used for testing purposes, so should be okay to overwrite system-managed packages RUN pip3 install -Ir /tmp/etc/requirements.txt --user WORKDIR /home/circleci diff --git a/circleci/images/pgupgradetester/Dockerfile b/circleci/images/pgupgradetester/Dockerfile index ac3dd09..02312da 100644 --- a/circleci/images/pgupgradetester/Dockerfile +++ b/circleci/images/pgupgradetester/Dockerfile @@ -75,5 +75,4 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres COPY ./files/etc/requirements.txt /tmp/etc/ -# this image is only used for testing purposes, so should be okay to overwrite system-managed packages RUN pip3 install -Ir /tmp/etc/requirements.txt --user diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile index c4550fa..ca2d19f 100644 --- a/circleci/images/stylechecker/Dockerfile +++ b/circleci/images/stylechecker/Dockerfile @@ -39,5 +39,5 @@ RUN apk add --no-cache --virtual installdeps \ && cd ../.. \ && rm -rf uncrustify-uncrustify-0.68.1/ \ # this image is only used for testing purposes, so should be okay to overwrite system-managed packages - && pip3 install -Ir /tmp/etc/requirements.txt --user \ + && pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages \ && apk del installdeps From e69c41f51c821e540b1ad2e4fe78197430a60e43 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 16 Feb 2024 16:08:18 +0300 Subject: [PATCH 6/7] try --- circleci/images/citusupgradetester/Dockerfile | 2 +- circleci/images/failtester/Dockerfile | 2 +- circleci/images/pgupgradetester/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile index 97b9a8a..00ad9f6 100644 --- a/circleci/images/citusupgradetester/Dockerfile +++ b/circleci/images/citusupgradetester/Dockerfile @@ -97,7 +97,7 @@ RUN chown -R circleci /usr/lib/postgresql/ /usr/include/postgresql/ /usr/share/p COPY ./files/etc/requirements.txt /tmp/etc/ -RUN pip3 install -Ir /tmp/etc/requirements.txt --user +RUN pip3 install -Ir /tmp/etc/requirements.txt WORKDIR /home/circleci diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile index 10eb62d..1e8bf88 100644 --- a/circleci/images/failtester/Dockerfile +++ b/circleci/images/failtester/Dockerfile @@ -75,6 +75,6 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres COPY ./files/etc/requirements.txt /tmp/etc/ -RUN pip3 install -Ir /tmp/etc/requirements.txt --user +RUN pip3 install -Ir /tmp/etc/requirements.txt WORKDIR /home/circleci diff --git a/circleci/images/pgupgradetester/Dockerfile b/circleci/images/pgupgradetester/Dockerfile index 02312da..0211487 100644 --- a/circleci/images/pgupgradetester/Dockerfile +++ b/circleci/images/pgupgradetester/Dockerfile @@ -75,4 +75,4 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres COPY ./files/etc/requirements.txt /tmp/etc/ -RUN pip3 install -Ir /tmp/etc/requirements.txt --user +RUN pip3 install -Ir /tmp/etc/requirements.txt From 4f49b4acf786f60936bae3ff7225a72dd7282362 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 16 Feb 2024 16:09:22 +0300 Subject: [PATCH 7/7] try --- circleci/images/citusupgradetester/Dockerfile | 1 - circleci/images/failtester/Dockerfile | 1 - circleci/images/pgupgradetester/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile index 00ad9f6..dbc1e55 100644 --- a/circleci/images/citusupgradetester/Dockerfile +++ b/circleci/images/citusupgradetester/Dockerfile @@ -96,7 +96,6 @@ FROM base RUN chown -R circleci /usr/lib/postgresql/ /usr/include/postgresql/ /usr/share/postgresql/ COPY ./files/etc/requirements.txt /tmp/etc/ - RUN pip3 install -Ir /tmp/etc/requirements.txt WORKDIR /home/circleci diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile index 1e8bf88..23f9691 100644 --- a/circleci/images/failtester/Dockerfile +++ b/circleci/images/failtester/Dockerfile @@ -74,7 +74,6 @@ ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql COPY ./files/etc/requirements.txt /tmp/etc/ - RUN pip3 install -Ir /tmp/etc/requirements.txt WORKDIR /home/circleci diff --git a/circleci/images/pgupgradetester/Dockerfile b/circleci/images/pgupgradetester/Dockerfile index 0211487..c78c11f 100644 --- a/circleci/images/pgupgradetester/Dockerfile +++ b/circleci/images/pgupgradetester/Dockerfile @@ -74,5 +74,4 @@ RUN echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /e RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql COPY ./files/etc/requirements.txt /tmp/etc/ - RUN pip3 install -Ir /tmp/etc/requirements.txt