diff --git a/dev/Dockerfile b/dev/Dockerfile index e1c1e390b..e694e47be 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 python:3.10 +FROM --platform=linux/amd64 python:3.10-slim WORKDIR /app @@ -6,11 +6,17 @@ COPY ./requirements.in ./ COPY ./requirements-dev.in ./ COPY ./Makefile ./ -RUN make install_requirements - -RUN wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | apt-key add - \ - && echo "deb https://packages.cloudfoundry.org/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list \ +RUN apt-get update \ + && apt-get upgrade -y \ + && apt-get install -y make wget gnupg ca-certificates curl \ + && make install_requirements \ + && install -m 0755 -d /etc/apt/keyrings \ + && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \ + && chmod a+r /etc/apt/keyrings/docker.gpg \ + && echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" > /etc/apt/sources.list.d/docker.list \ + && wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | gpg --dearmor -o /usr/share/keyrings/cloudfoundry.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/cloudfoundry.gpg] https://packages.cloudfoundry.org/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list \ && apt-get update \ - && apt-get install -y cf-cli docker zip + && apt-get install -y cf-cli docker-ce-cli zip -RUN cf install-plugin -f cflocal +RUN cf install-plugin -f cflocal \ No newline at end of file diff --git a/requirements.in b/requirements.in index 57a369315..9369339fb 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ backoff==2.2.1 certifi==2024.8.30 cryptography==48.0.1 distro==1.9.0 -httplib2==0.22.0 +httplib2>=0.32.0 idna==3.15 jinja2==3.1.6 omegaconf==2.3.0 diff --git a/requirements.txt b/requirements.txt index 8e3483636..f1eb0d1d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None --strip-extras requirements.in +# pip-compile --strip-extras requirements.in # antlr4-python3-runtime==4.9.3 # via omegaconf @@ -20,7 +20,7 @@ cryptography==48.0.1 # via -r requirements.in distro==1.9.0 # via -r requirements.in -httplib2==0.22.0 +httplib2==0.32.0 # via -r requirements.in idna==3.15 # via @@ -36,7 +36,7 @@ psycopg2-binary==2.9.10 # via -r requirements.in pycparser==2.20 # via cffi -pyparsing==2.4.7 +pyparsing==3.3.2 # via httplib2 pyyaml==6.0.2 # via @@ -45,7 +45,9 @@ pyyaml==6.0.2 requests==2.34.2 # via -r requirements.in typing-extensions==4.15.0 - # via -r requirements.in + # via + # -r requirements.in + # cryptography urllib3==2.7.0 # via # -r requirements.in