diff options
| author | nicolargo <nicolas@nicolargo.com> | 2023-05-13 16:57:43 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2023-05-13 16:57:43 +0200 |
| commit | c56f07673ec1a65545da5c90e4240e3b4ecfdb19 (patch) | |
| tree | cb953053f9328da5988f36f38ae9286c09c51019 /docker-files | |
| parent | ff504b982239fea21d4c0d8e72c54e297543dff1 (diff) | |
First try to solve issue on Docker images. Docker plugin do not work as expected - Related to #2392
Diffstat (limited to 'docker-files')
| -rw-r--r-- | docker-files/alpine.Dockerfile | 12 | ||||
| -rw-r--r-- | docker-files/ubuntu.Dockerfile | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile index aa551ce9..768cf187 100644 --- a/docker-files/alpine.Dockerfile +++ b/docker-files/alpine.Dockerfile @@ -52,16 +52,15 @@ RUN apk add --no-cache \ RUN python${PYTHON_VERSION} -m venv --system-site-packages --without-pip venv -COPY requirements.txt webui-requirements.txt optional-requirements.txt ./ +COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./ ############################################################################## # BUILD: Install the minimal image deps FROM build as buildMinimal -RUN /venv/bin/python3 -m pip install \ - docker \ - python-dateutil \ - #-r requirements.txt \ +RUN /venv/bin/python3 -m pip install --no-cache-dir \ + # Note: requirements.txt is include by dep + -r docker-requirements.txt \ -r webui-requirements.txt ############################################################################## @@ -73,8 +72,7 @@ ARG CASS_DRIVER_NO_CYTHON=1 # See issue 2368 ARG CARGO_NET_GIT_FETCH_WITH_CLI=true -RUN /venv/bin/python3 -m pip install \ - #-r requirements.txt \ +RUN /venv/bin/python3 -m pip install --no-cache-dir \ -r optional-requirements.txt ############################################################################## diff --git a/docker-files/ubuntu.Dockerfile b/docker-files/ubuntu.Dockerfile index b5c148bc..05186eaf 100644 --- a/docker-files/ubuntu.Dockerfile +++ b/docker-files/ubuntu.Dockerfile @@ -51,24 +51,22 @@ RUN apt-get update \ RUN python${PYTHON_VERSION} -m venv venv -COPY requirements.txt webui-requirements.txt optional-requirements.txt ./ +COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./ ############################################################################## # BUILD: Install the minimal image deps FROM build as buildMinimal -RUN /venv/bin/python3 -m pip install \ - docker \ - python-dateutil \ - #-r requirements.txt \ +RUN /venv/bin/python3 -m pip install --no-cache-dir \ + # Note: requirements.txt is include by dep + -r docker-requirements.txt \ -r webui-requirements.txt ############################################################################## # BUILD: Install all the deps FROM build as buildFull -RUN /venv/bin/python3 -m pip install \ - #-r requirements.txt \ +RUN /venv/bin/python3 -m pip install --no-cache-dir \ -r optional-requirements.txt ############################################################################## |