From e3c2acb4ded0888c62cc3a446e29143a61f6ceca Mon Sep 17 00:00:00 2001 From: Bill Teng Date: Sat, 8 Jun 2024 09:44:45 +0000 Subject: [PATCH] #0: clean out dependencies from docker --- dockerfile/ubuntu-20.04-amd64.Dockerfile | 3 +-- scripts/docker/install_test_deps.sh | 17 +++-------------- scripts/docker/requirements.txt | 3 --- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/dockerfile/ubuntu-20.04-amd64.Dockerfile b/dockerfile/ubuntu-20.04-amd64.Dockerfile index a5ca82f1d762..e1d05e18ca86 100644 --- a/dockerfile/ubuntu-20.04-amd64.Dockerfile +++ b/dockerfile/ubuntu-20.04-amd64.Dockerfile @@ -2,7 +2,6 @@ FROM ubuntu:20.04 ARG DEBIAN_FRONTEND=noninteractive -ENV GTEST_VERSION=1.13.0 ENV DOXYGEN_VERSION=1.9.6 # Install build and runtime deps @@ -19,7 +18,7 @@ RUN apt-get -y update \ ## Test Related Dependencies COPY /scripts/docker/install_test_deps.sh /opt/tt_metal_infra/scripts/docker/install_test_deps.sh -RUN /bin/bash /opt/tt_metal_infra/scripts/docker/install_test_deps.sh ${GTEST_VERSION} ${DOXYGEN_VERSION} +RUN /bin/bash /opt/tt_metal_infra/scripts/docker/install_test_deps.sh ${DOXYGEN_VERSION} # Copy remaining convenience scripts COPY /scripts /opt/tt_metal_infra/scripts diff --git a/scripts/docker/install_test_deps.sh b/scripts/docker/install_test_deps.sh index 2f6c3fedde2b..88face8c94f6 100755 --- a/scripts/docker/install_test_deps.sh +++ b/scripts/docker/install_test_deps.sh @@ -1,23 +1,12 @@ #!/bin/bash # Check if two arguments are provided -if [ "$#" -ne 2 ]; then - echo "Usage: $0 " +if [ "$#" -ne 1 ]; then + echo "Usage: $0 " exit 1 fi -GTEST_VERSION=$1 -DOXYGEN_VERSION=$2 - -# Installs Google test -mkdir -p /opt/tt_metal_infra/googletest -chmod ugo+w /opt/tt_metal_infra/googletest -wget -O /opt/tt_metal_infra/googletest/googletest-release-${GTEST_VERSION}.tar.gz https://github.com/google/googletest/archive/refs/tags/v${GTEST_VERSION}.tar.gz -tar -xzf /opt/tt_metal_infra/googletest/googletest-release-${GTEST_VERSION}.tar.gz -C /opt/tt_metal_infra/googletest/ -cd /opt/tt_metal_infra/googletest/googletest-${GTEST_VERSION} -cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON . -make -make install +DOXYGEN_VERSION=$1 # Install doxygen mkdir -p /opt/tt_metal_infra/doxygen diff --git a/scripts/docker/requirements.txt b/scripts/docker/requirements.txt index 1b8609142cdf..0f5bc89a57f1 100644 --- a/scripts/docker/requirements.txt +++ b/scripts/docker/requirements.txt @@ -2,12 +2,9 @@ apt-utils dialog software-properties-common=0.99.9.12 build-essential=12.8ubuntu1.1 -libgoogle-glog-dev=0.4.0-1build1 libyaml-cpp-dev=0.6.2-4ubuntu1 git git-lfs -libboost-all-dev=1.71.0.0ubuntu2 -libsndfile1=1.0.28-7ubuntu0.2 pandoc libtbb-dev libcapstone-dev