Skip to content

Commit

Permalink
🔥 move the docker files to their own repos (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
Wei Li committed Jul 14, 2017
1 parent aeb2193 commit b89f1a7
Show file tree
Hide file tree
Showing 15 changed files with 4 additions and 519 deletions.
41 changes: 4 additions & 37 deletions docker/README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,6 @@
# AeroGear Digger Docker images
The files are moved to these repos:

This directory contains the Docker source for images that are used in AeroGear Digger.
* [AeroGear Digger Android SDK Installer](https://github.com/aerogear/digger-android-sdk-image)
* [AeroGear Digger Jenkins Slave for Android](https://github.com/aerogear/digger-android-slave-image)

We use the [Jenkins image](https://github.com/openshift/jenkins) from OpenShift team as the Jenkins master.

However, we use custom images for slaves.

## android-slave

This is the Jenkins Android slave that is used to build Android applications.

It has the base tools required to build an Android application. The Android SDK however, is not included.

## android-sdk

This is an image that is preconfigured to download Android SDK. Android SDK cannot be included in the container directly because of the license issues.

Thus, this image contains a "androidctl" script which installs the Android sdk and its related packages that prompts you to accept the license.
However, keep in mind that it does not automate the "accept license" step (you need to manually accept the android/google license/terms and conditions).

The Android SDK in the container will be reused by the Android slave containers.



## Building

Both Android slave and Android SDK images can be built and published using the usual Docker commands.

cd android-slave
docker build . -t aerogear/jenkins-android-slave

cd android-sdk
docker build . -t aerogear/android-sdk

For release builds, publish image to Docker Hub:

docker push aerogear/jenkins-android-slave
docker push aerogear/android-sdk
This repo will be removed in the future.
39 changes: 0 additions & 39 deletions docker/android-sdk/Dockerfile

This file was deleted.

31 changes: 0 additions & 31 deletions docker/android-sdk/tools/androidctl-bin

This file was deleted.

92 changes: 0 additions & 92 deletions docker/android-sdk/tools/androidctl/__main__.py

This file was deleted.

31 changes: 0 additions & 31 deletions docker/android-sdk/tools/androidctl/keytool.py

This file was deleted.

38 changes: 0 additions & 38 deletions docker/android-sdk/tools/androidctl/pkg.py

This file was deleted.

8 changes: 0 additions & 8 deletions docker/android-sdk/tools/androidctl/props.cfg

This file was deleted.

29 changes: 0 additions & 29 deletions docker/android-sdk/tools/androidctl/props.py

This file was deleted.

Loading

0 comments on commit b89f1a7

Please sign in to comment.