From 3ee9d48f2ab1b640a735d30823412f8756fae772 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 15 Oct 2015 14:04:33 -0700 Subject: also removing grpc_java_android docker file --- tools/dockerfile/grpc_java_android/Dockerfile | 62 --------------------------- tools/dockerfile/grpc_java_android/README.md | 42 ------------------ tools/dockerfile/grpc_java_base/Dockerfile | 55 ------------------------ tools/dockerfile/grpc_java_base/README.md | 9 ---- 4 files changed, 168 deletions(-) delete mode 100644 tools/dockerfile/grpc_java_android/Dockerfile delete mode 100644 tools/dockerfile/grpc_java_android/README.md delete mode 100644 tools/dockerfile/grpc_java_base/Dockerfile delete mode 100644 tools/dockerfile/grpc_java_base/README.md (limited to 'tools/dockerfile') diff --git a/tools/dockerfile/grpc_java_android/Dockerfile b/tools/dockerfile/grpc_java_android/Dockerfile deleted file mode 100644 index 8df0707758..0000000000 --- a/tools/dockerfile/grpc_java_android/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2015, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Dockerfile for the gRPC Java dev image -FROM grpc/java_base - -# Required by accessing Android's aapt -RUN apt-get install -y lib32stdc++6 lib32z1 && apt-get clean - -# Install Android SDK 24.2 -RUN curl -L http://dl.google.com/android/android-sdk_r24.2-linux.tgz | tar xz -C /usr/local - -# Environment variables -ENV ANDROID_HOME /usr/local/android-sdk-linux -ENV PATH $PATH:$ANDROID_HOME/tools -ENV PATH $PATH:$ANDROID_HOME/platform-tools -# Some old Docker versions consider '/' as HOME -ENV HOME /root - -# Update sdk for android API level 19 (4.4), 21 (5.0), 22 (5.1). -RUN echo y | android update sdk --all --filter platform-tools,build-tools-22.0.1,sys-img-armeabi-v7a-addon-google_apis-google-22,sys-img-armeabi-v7a-addon-google_apis-google-21,sys-img-armeabi-v7a-android-19,android-22,android-21,android-19,addon-google_apis-google-22,addon-google_apis-google-21,addon-google_apis-google-19,extra-android-m2repository,extra-google-m2repository --no-ui --force - - -# Create AVDs with API level 19,21,22 -RUN echo no | android create avd --force -n avd-google-api-22 -t "Google Inc.:Google APIs:22" --abi google_apis/armeabi-v7a && \ - echo no | android create avd --force -n avd-google-api-21 -t "Google Inc.:Google APIs:21" --abi google_apis/armeabi-v7a && \ - echo no | android create avd --force -n avd-google-api-19 -t "Google Inc.:Google APIs:19" --abi default/armeabi-v7a - -# Pull gRPC Java and trigger download of needed Maven and Gradle artifacts. -RUN git clone --depth 1 https://github.com/grpc/grpc-java.git /var/local/git/grpc-java && \ - cd /var/local/git/grpc-java && \ - ./gradlew grpc-core:install grpc-stub:install grpc-okhttp:install grpc-protobuf-nano:install grpc-compiler:install - -# Config android sdk for gradle and build apk to trigger download of needed Maven and Gradle artifacts. -RUN cd /var/local/git/grpc-java/android-interop-testing && echo "sdk.dir=/usr/local/android-sdk-linux" > local.properties && \ - ../gradlew assembleDebug diff --git a/tools/dockerfile/grpc_java_android/README.md b/tools/dockerfile/grpc_java_android/README.md deleted file mode 100644 index 5c897cd779..0000000000 --- a/tools/dockerfile/grpc_java_android/README.md +++ /dev/null @@ -1,42 +0,0 @@ -GRPC Android Dockerfile -==================== - -Dockerfile for creating the gRPC Android integration test image - -As of 2015/05 this - - is based on the gRPC Java base - - installs Android sdk 24.2 - - creates an AVD for API level 22 - - Pulls gRpc Android test App from github - -Usage ------ - -Start the emulator in a detached container, the argument is the name of the AVD you want to start: - -``` -$ sudo docker run --name=grpc_android_test -d grpc/android /var/local/git/grpc-java/android-interop-testing/start-emulator.sh avd-google-api-22 -``` - -You can use the following cammand to wait until the emulator is ready: -``` -$ sudo docker exec grpc_android_test /var/local/git/grpc-java/android-interop-testing/wait-for-emulator.sh -``` - -When you want to update the apk, run: -``` -$ sudo docker exec grpc_android_test bash -c "cd /var/local/git/grpc-java && git pull origin master && ./gradlew grpc-core:install grpc-stub:install grpc-okhttp:install grpc-protobuf-nano:install grpc-compiler:install && cd android-interop-testing && ../gradlew installDebug" -``` -It pulls the fresh code of gRpc Java and our interop test app from github, build and install it to the runing emulator (so you need to make sure there is a runing emulator). - -Trigger the integration test: -``` -$ sudo docker exec grpc_android_test adb -e shell am instrument -w -e server_host -e server_port 8030 -e server_host_override foo.test.google.fr -e use_tls true -e use_test_ca true -e test_case all io.grpc.android.integrationtest/.TesterInstrumentation -``` - -You can also use the android/adb cammands to get more info, such as: -``` -$ sudo docker exec grpc_android_test android list avd -$ sudo docker exec grpc_android_test adb devices -$ sudo docker exec grpc_android_test adb logcat -``` diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile deleted file mode 100644 index 9b80bbf9bc..0000000000 --- a/tools/dockerfile/grpc_java_base/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2015, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -FROM debian:latest - -# Install JDK 8 and Git -# -# TODO(temiola): simplify this if/when a simpler process is available. -# -RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ - echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \ - echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \ - apt-get update && \ - apt-get -y install \ - git \ - libapr1 \ - oracle-java8-installer \ - && \ - apt-get clean && rm -r /var/cache/oracle-jdk8-installer/ - -ENV JAVA_HOME /usr/lib/jvm/java-8-oracle -ENV PATH $PATH:$JAVA_HOME/bin - -# Trigger download of as many Gradle artifacts as possible. -RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && \ - cd grpc-java && \ - ./gradlew build -PskipCodegen=true && \ - rm -r "$(pwd)" diff --git a/tools/dockerfile/grpc_java_base/README.md b/tools/dockerfile/grpc_java_base/README.md deleted file mode 100644 index 446287fc7c..0000000000 --- a/tools/dockerfile/grpc_java_base/README.md +++ /dev/null @@ -1,9 +0,0 @@ -GRPC Java Base Dockerfile -========================= - -Dockerfile for creating the Java gRPC development Docker instance. - -As of 2014/12 this - - installs tools and dependencies needed to build gRPC Java - - does not install gRPC Java itself; a separate Dockerfile that depends on - this one will do that. \ No newline at end of file -- cgit v1.2.3