Skip to content

Commit 4fbfbe6

Browse files
hramosfacebook-github-bot
authored andcommitted
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 #17325 Differential Revision: D6630793 Pulled By: hramos fbshipit-source-id: ec76ec86aec0debf914649b7ec5fdafccf28fec7
1 parent 85ff264 commit 4fbfbe6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ContainerShip/Dockerfile.android

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM containership/android-base:latest
1+
FROM hramos/android-base:latest
22

33
# set default environment variables
44
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
@@ -38,7 +38,6 @@ RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion
3838
RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1 -Pcom.android.build.threadPoolSize=1
3939

4040
# add all react-native code
41-
# How does this work?
4241
ADD . /app
4342
WORKDIR /app
4443

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@
126126
"lint": "eslint .",
127127
"prettier": "find . -name node_modules -prune -or -name '*.js' -print | xargs prettier --write",
128128
"start": "/usr/bin/env bash -c './scripts/packager.sh \"$@\" || true' --",
129-
"test-android-setup": "docker pull containership/android-base:latest",
129+
"test-android-setup": "docker pull hramos/android-base:latest",
130+
"test-android-build-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .",
130131
"test-android-build": "docker build -t react/android -f ContainerShip/Dockerfile.android .",
131132
"test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-instrumentation-tests.sh",
132133
"test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-unit-tests.sh",

0 commit comments

Comments
 (0)