aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker-compose.yml4
-rw-r--r--docker/bionic/test-android.Dockerfile2
2 files changed, 3 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index a17d29e94..ac9ba433f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
bionic-android-513:
<< : *linux
hostname: bionic-android
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-1
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-2
build:
dockerfile: docker/bionic/test-android.Dockerfile
context: .
@@ -36,7 +36,7 @@ services:
bionic-android-514:
<< : *linux
hostname: bionic-android
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-1
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-2
build:
dockerfile: docker/bionic/test-android.Dockerfile
context: .
diff --git a/docker/bionic/test-android.Dockerfile b/docker/bionic/test-android.Dockerfile
index 854c67a19..56bb0b9e6 100644
--- a/docker/bionic/test-android.Dockerfile
+++ b/docker/bionic/test-android.Dockerfile
@@ -43,7 +43,7 @@ RUN apt-get update -qq && \
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
RUN echo "export JAVA_HOME=${JAVA_HOME}" > /etc/profile.d/android.sh && \
- echo "export PATH=${JAVA_HOME}:\${PATH}" >> /etc/profile.d/android.sh
+ echo "export PATH=${JAVA_HOME}/bin:\${PATH}" >> /etc/profile.d/android.sh
ENV ANDROID_HOME="/home/${USER_NAME}/android"
ENV ANDROID_SDK_ROOT=${ANDROID_HOME}