diff --git a/PR_Practice.txt b/PR_Practice.txt index c815536..87f0cec 100644 --- a/PR_Practice.txt +++ b/PR_Practice.txt @@ -1,4 +1,6 @@ Sahil Jain +Vivek Abraham Naren Bharadwaj Mehul Murali Vinson Zheng + diff --git a/graphics-service/Dockerfile b/graphics-service/Dockerfile index f7f26db..446a074 100644 --- a/graphics-service/Dockerfile +++ b/graphics-service/Dockerfile @@ -1,6 +1,6 @@ -FROM gcc:9.2 - -ENV DEBIAN_FRONTEND noninteractive +ARG OS +ARG FROM_DIRECTORY +FROM $FROM_DIRECTORY RUN apt-get update RUN apt-get install -y build-essential git @@ -10,16 +10,21 @@ RUN apt-get install -y libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1- RUN apt-get install -y cmake unzip RUN apt-get install -y libcanberra-gtk-module libcanberra-gtk3-module RUN apt-get install -y mesa-utils libjsoncpp-dev libcurl4-gnutls-dev +RUN if [ "$OS" = "Mac" ]; then \ + apt-get install -y gcc-9 && \ + apt-get upgrade libstdc++6 && \ + apt-get install -y libssl-dev; fi WORKDIR /usr/src +RUN apt-get install wget RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz RUN tar -zxvf cmake-3.20.0.tar.gz RUN rm cmake-3.20.0.tar.gz RUN cd cmake-3.20.0 WORKDIR /usr/src/cmake-3.20.0 RUN ./bootstrap -RUN make -j +RUN make RUN make install -j WORKDIR /usr/src @@ -34,4 +39,4 @@ RUN make install -j WORKDIR /usr/smart-mirror -CMD bash \ No newline at end of file +CMD bash