From 4790cbab4da4ce9b32913e8e867e7466b3d8d778 Mon Sep 17 00:00:00 2001 From: gonzalezpach Date: Thu, 15 Jun 2023 09:54:03 +0200 Subject: [PATCH] Remove dependencies no longer needed by pycurl Change-Id: I942e786ab9286f2f30bd60e146ea862324e4ca4d Signed-off-by: gonzalezpach --- docker/osmclient/Dockerfile | 1 - docker/tests/Dockerfile | 1 - installers/full_install_osm.sh | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index ae4a1ab9..e5b3acdc 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -34,7 +34,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - libcurl4-openssl-dev=7.68.* \ libssl-dev=1.1.* ARG PYTHON3_OSMCLIENT_URL diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 2c824bc3..34afcfc9 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -41,7 +41,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ git=1:2.34.* \ iputils-ping=3:* \ jq=1.6* \ - libcurl4-openssl-dev=7.81.* \ libssl-dev=3.0.* \ libmagic1=1:5.* diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index f110b9ac..678d9694 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -189,7 +189,7 @@ function install_osmclient(){ python3 -m pip install -r /usr/lib/python3/dist-packages/osm_im/requirements.txt fi if [ -f /usr/lib/python3/dist-packages/osmclient/requirements.txt ]; then - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libcurl4-openssl-dev libssl-dev libmagic1 + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libssl-dev libmagic1 python3 -m pip install -r /usr/lib/python3/dist-packages/osmclient/requirements.txt fi [ -z "$INSTALL_LIGHTWEIGHT" ] && export OSM_HOSTNAME=`lxc list | awk '($2=="SO-ub"){print $6}'` -- 2.25.1