From c7afb2ec027bb842922fde92f1a7e3ec772e8eca Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 11 Jun 2020 14:33:24 -0700 Subject: [PATCH 1/3] Update Linux desktop Dockerfile for GTK switch Once the switch to GTK lands, libgtk-3-dev will be needed for building. Also updates all the 'apt-get' commands to the more modern 'apt' --- .ci/Dockerfile-LinuxDesktop | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/Dockerfile-LinuxDesktop b/.ci/Dockerfile-LinuxDesktop index 75308c4aa400..1e267987b4f3 100644 --- a/.ci/Dockerfile-LinuxDesktop +++ b/.ci/Dockerfile-LinuxDesktop @@ -1,8 +1,8 @@ FROM cirrusci/flutter:stable -RUN sudo apt-get update -y +RUN sudo apt update -y -RUN sudo apt-get install -y --no-install-recommends gnupg +RUN sudo apt install -y --no-install-recommends gnupg # Add repo for gcloud sdk and install it RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ @@ -11,11 +11,11 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages. RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - -RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ +RUN sudo apt update && sudo apt install -y google-cloud-sdk && \ gcloud config set core/disable_usage_reporting true && \ gcloud config set component_manager/disable_update_check true # Install xvfb to allow running headless -RUN sudo apt-get install -y xvfb libegl1-mesa +RUN sudo apt install -y xvfb libegl1-mesa # Install Linux desktop build tool requirements. -RUN sudo apt-get install -y clang cmake ninja-build file pkg-config +RUN sudo apt install -y clang cmake ninja-build file pkg-config libgtk-3-dev From b29e0544895c1eb0528ab7b3dcd52f58405bb9bc Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 11 Jun 2020 16:11:15 -0700 Subject: [PATCH 2/3] Re-apt-get-ify --- .ci/Dockerfile-LinuxDesktop | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/Dockerfile-LinuxDesktop b/.ci/Dockerfile-LinuxDesktop index 1e267987b4f3..2d6a6ad23243 100644 --- a/.ci/Dockerfile-LinuxDesktop +++ b/.ci/Dockerfile-LinuxDesktop @@ -1,8 +1,8 @@ FROM cirrusci/flutter:stable -RUN sudo apt update -y +RUN sudo apt-get update -y -RUN sudo apt install -y --no-install-recommends gnupg +RUN sudo apt-get install -y --no-install-recommends gnupg # Add repo for gcloud sdk and install it RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ @@ -11,11 +11,11 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages. RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - -RUN sudo apt update && sudo apt install -y google-cloud-sdk && \ +RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ gcloud config set core/disable_usage_reporting true && \ gcloud config set component_manager/disable_update_check true # Install xvfb to allow running headless -RUN sudo apt install -y xvfb libegl1-mesa +RUN sudo apt-get install -y xvfb libegl1-mesa # Install Linux desktop build tool requirements. -RUN sudo apt install -y clang cmake ninja-build file pkg-config libgtk-3-dev +RUN sudo apt-get install -y clang cmake ninja-build file pkg-config libgtk-3-dev From bfd6f9e4d68bd8ea5c2971d6a0aecfe1b7ea9ddb Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 12 Jun 2020 07:31:48 -0700 Subject: [PATCH 3/3] Minor restructure to force Docker regeneration. --- .ci/Dockerfile-LinuxDesktop | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci/Dockerfile-LinuxDesktop b/.ci/Dockerfile-LinuxDesktop index 2d6a6ad23243..25924d4ea8d9 100644 --- a/.ci/Dockerfile-LinuxDesktop +++ b/.ci/Dockerfile-LinuxDesktop @@ -18,4 +18,6 @@ RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ # Install xvfb to allow running headless RUN sudo apt-get install -y xvfb libegl1-mesa # Install Linux desktop build tool requirements. -RUN sudo apt-get install -y clang cmake ninja-build file pkg-config libgtk-3-dev +RUN sudo apt-get install -y clang cmake ninja-build file pkg-config +# Install necessary libraries. +RUN sudo apt-get install -y libgtk-3-dev