admin/docker-emulator-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Dockerfile generation

Browse Source 
sed should replace globally
added unzip -q
This commit is contained in:
Anton Malinskiy
2018-02-13 13:02:09 +07:00
parent 3e72cb420a
commit 952f26ae62
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -4,10 +4,10 @@ VERSIONS = android-16 android-17 android-18 android-19 android-21 android-22 and
generate: generate:
for version in $(VERSIONS); do \ for version in $(VERSIONS); do \
mkdir -p ./build/$$version ; \ mkdir -p ./build/$$version ; \
sed "s/{{ platform }}/$$version/" templates/Dockerfile > build/$$version/Dockerfile ; \ sed "s/{{ platform }}/$$version/g" templates/Dockerfile > build/$$version/Dockerfile ; \
sed "s/{{ platform }}/$$version/" templates/config.ini > build/$$version/config.ini ; \ sed "s/{{ platform }}/$$version/g" templates/config.ini > build/$$version/config.ini ; \
sed "s/{{ platform }}/$$version/" templates/start.sh > build/$$version/start.sh ; \ sed "s/{{ platform }}/$$version/g" templates/start.sh > build/$$version/start.sh ; \
sed "s/{{ platform }}/$$version/" templates/Makefile > build/$$version/Makefile ; \ sed "s/{{ platform }}/$$version/g" templates/Makefile > build/$$version/Makefile ; \
cp base/* ./build/$$version ; \ cp base/* ./build/$$version ; \
done done

3
templates/Dockerfile
View File

@@ -27,13 +27,14 @@ RUN dpkg --add-architecture i386 && \
# Install Android SDK # Install Android SDK
curl -L $LINK_ANDROID_SDK > /tmp/android-sdk-linux.zip && \ curl -L $LINK_ANDROID_SDK > /tmp/android-sdk-linux.zip && \
unzip /tmp/android-sdk-linux.zip -d /opt/android-sdk-linux/ && \ unzip -q /tmp/android-sdk-linux.zip -d /opt/android-sdk-linux/ && \
rm /tmp/android-sdk-linux.zip && \ rm /tmp/android-sdk-linux.zip && \
# Customized steps per specific platform # Customized steps per specific platform
yes | sdkmanager --no_https --licenses && \ yes | sdkmanager --no_https --licenses && \
sdkmanager --no_https emulator tools platform-tools "platforms;{{ platform }}" "system-images;{{ platform }};google_apis;x86" --verbose && \ sdkmanager --no_https emulator tools platform-tools "platforms;{{ platform }}" "system-images;{{ platform }};google_apis;x86" --verbose && \
echo no | avdmanager create avd -n "x86" --package "system-images;{{ platform }};google_apis;x86" --tag google_apis && \ echo no | avdmanager create avd -n "x86" --package "system-images;{{ platform }};google_apis;x86" --tag google_apis && \
# Unfilter devices (now local because CI downloads from github are unstable) # Unfilter devices (now local because CI downloads from github are unstable)
# curl -o /root/.android/adb_usb.ini https://raw.githubusercontent.com/apkudo/adbusbini/master/adb_usb.ini && \ # curl -o /root/.android/adb_usb.ini https://raw.githubusercontent.com/apkudo/adbusbini/master/adb_usb.ini && \