From commits-return-27957-archive-asf-public=cust-asf.ponee.io@geode.apache.org Tue Aug 14 19:58:04 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id E03FF18067A for ; Tue, 14 Aug 2018 19:58:03 +0200 (CEST) Received: (qmail 80096 invoked by uid 500); 14 Aug 2018 17:58:03 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 80084 invoked by uid 99); 14 Aug 2018 17:58:03 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Aug 2018 17:58:03 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6441F80731; Tue, 14 Aug 2018 17:58:02 +0000 (UTC) Date: Tue, 14 Aug 2018 17:58:01 +0000 To: "commits@geode.apache.org" Subject: [geode] branch develop updated: Revert "[GEODE-5580] Convert test-container image to use alpine." MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153426948131.26114.2996096305171596577@gitbox.apache.org> From: jbarrett@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 34ce6cd36773782a0d4b9a8fab8961b2e1ebd2c2 X-Git-Newrev: c4ee03d79d001769e58d7b86a26e2634a23d0949 X-Git-Rev: c4ee03d79d001769e58d7b86a26e2634a23d0949 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new c4ee03d Revert "[GEODE-5580] Convert test-container image to use alpine." c4ee03d is described below commit c4ee03d79d001769e58d7b86a26e2634a23d0949 Author: Jacob Barrett AuthorDate: Tue Aug 14 10:57:30 2018 -0700 Revert "[GEODE-5580] Convert test-container image to use alpine." This reverts commit 4b41429bd3846eef4a31dbc70efb88fed2082227. --- ci/images/test-container/Dockerfile | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/ci/images/test-container/Dockerfile b/ci/images/test-container/Dockerfile index d72e96b..a8a6d86 100644 --- a/ci/images/test-container/Dockerfile +++ b/ci/images/test-container/Dockerfile @@ -13,12 +13,31 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM openjdk:8-jdk-alpine +FROM openjdk:8 ENTRYPOINT [] +ARG CHROME_DRIVER_VERSION=2.35 -RUN apk --no-cache add \ - bash \ - shadow \ - && useradd --shell /bin/bash -u 93043 -o -c "" -m geode -WORKDIR /home/geode +WORKDIR /tmp/work +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apt-transport-https \ + lsb-release \ + && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ + && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + aptitude \ + ca-certificates \ + google-chrome-stable \ + && wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \ + && rm -rf /opt/selenium/chromedriver \ + && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \ + && rm /tmp/chromedriver_linux64.zip \ + && mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \ + && chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \ + && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver \ + && useradd --shell /bin/bash -u 93043 -o -c "" -m geode \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/work