From 499fd7b2f19fe029d862c32251d08346fae78e01 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 7 Mar 2019 10:06:30 -0500 Subject: [PATCH 1/2] Revert "Fix chrome can not be started with unit-tests due to missing shared libraries" This reverts commit 3e5f328b52430e0c82007717f39ab307084e5288. --- tools/docker-compose/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 49b7828952..b2606c407c 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -17,11 +17,9 @@ RUN yum -y update && yum -y install openssh-server ansible mg vim tmux \ xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 \ xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap \ zanata-python-client gettext gcc-c++ libcurl-devel bzip2 rsync \ - pango libXcomposite libXcursor libXdamage \ - libXext libXi libXtst cups-libs libXScrnSaver libXrandr GConf2 alsa-lib atk \ - gtk3 ipa-gothic-fonts xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi \ - xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 \ - xorg-x11-fonts-misc + libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrender \ + libXtst cups-libs libXScrnSaver libXrandr alsa-lib pango cairo \ + atk at-spi2-atk gtk3 gdk-pixbuf2 RUN ln -s /usr/bin/python36 /usr/bin/python3 From 5cf7cc21c8f8f5043fb8c52b79e9032f103f1203 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 7 Mar 2019 10:07:08 -0500 Subject: [PATCH 2/2] Revert "Fix chrome can not be started with unit-tests due to missing shared libraries" This reverts commit d558ffd699551946715996011b85f80cfd24ec67. --- tools/docker-compose/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index b2606c407c..54b87ccc2e 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -16,10 +16,8 @@ RUN yum -y update && yum -y install openssh-server ansible mg vim tmux \ libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel \ xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 \ xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap \ - zanata-python-client gettext gcc-c++ libcurl-devel bzip2 rsync \ - libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrender \ - libXtst cups-libs libXScrnSaver libXrandr alsa-lib pango cairo \ - atk at-spi2-atk gtk3 gdk-pixbuf2 + zanata-python-client gettext gcc-c++ libcurl-devel bzip2 \ + rsync RUN ln -s /usr/bin/python36 /usr/bin/python3