From 4fbfbe6bb0e0eaaf12ec713888bf2c6a347f0f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Fri, 22 Dec 2017 20:18:43 -0800 Subject: [PATCH] Update image Summary: Use newer Docker image and add script that rebuilds the image locally Rebuilding should be rarely needed, but in this case we did need a newer BUCK version To run tests locally: ``` npm run test-android-setup npm run test-android-build npm run test-android-run-unit-test ``` If a newer android-base image is needed, just run `npm run test-android-build-base` to rebuild the image locally. Ping hramos if the Docker hub image is too out of date. Closes https://github.com/facebook/react-native/pull/17325 Differential Revision: D6630793 Pulled By: hramos fbshipit-source-id: ec76ec86aec0debf914649b7ec5fdafccf28fec7 --- ContainerShip/Dockerfile.android | 3 +-- package.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ContainerShip/Dockerfile.android b/ContainerShip/Dockerfile.android index df71885cafe..adb361ab58f 100644 --- a/ContainerShip/Dockerfile.android +++ b/ContainerShip/Dockerfile.android @@ -1,4 +1,4 @@ -FROM containership/android-base:latest +FROM hramos/android-base:latest # set default environment variables ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\"" @@ -38,7 +38,6 @@ RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1 -Pcom.android.build.threadPoolSize=1 # add all react-native code -# How does this work? ADD . /app WORKDIR /app diff --git a/package.json b/package.json index 66e2b2d6690..0415ee1395b 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,8 @@ "lint": "eslint .", "prettier": "find . -name node_modules -prune -or -name '*.js' -print | xargs prettier --write", "start": "/usr/bin/env bash -c './scripts/packager.sh \"$@\" || true' --", - "test-android-setup": "docker pull containership/android-base:latest", + "test-android-setup": "docker pull hramos/android-base:latest", + "test-android-build-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .", "test-android-build": "docker build -t react/android -f ContainerShip/Dockerfile.android .", "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-instrumentation-tests.sh", "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-unit-tests.sh",