Skip to content

Commit

Permalink
Build in Docker. Update new version on Google Play.
Browse files Browse the repository at this point in the history
  • Loading branch information
bradfitz committed Mar 10, 2014
1 parent 27d4504 commit dbb9e95
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 2 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="1"
android:versionName="1.0"
android:versionCode="2"
android:versionName="1.1"
package="com.danga.garagedoor">

<uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17" />
Expand Down
8 changes: 8 additions & 0 deletions Makefile
@@ -0,0 +1,8 @@
env:
docker build -t danga/garagebuild devenv

dockerdebug:
docker run -v /home/bradfitz/src/github.com/bradfitz/android-garage-opener:/src/android-garage-opener danga/garagebuild /src/android-garage-opener/build-in-docker.pl debug

dockerrelease:
docker run -t -i -v /home/bradfitz/src/github.com/bradfitz/android-garage-opener:/src/android-garage-opener -v $(HOME)/keys/android-garage:/keys danga/garagebuild /src/android-garage-opener/build-in-docker.pl release
19 changes: 19 additions & 0 deletions build-in-docker.pl
@@ -0,0 +1,19 @@
#!/usr/bin/perl

use strict;
use File::Path qw(make_path);

die "This script is meant to be run within the danga/garagebuild Docker contain. Run 'make env' to build it.\n"
unless $ENV{IN_DOCKER};

my $mode = shift || "debug";

my $ANDROID = "/src/android-garage-opener";

print "Running ant $mode\n";
chdir $ANDROID or die "can't cd to android dir";
exec "ant",
"-Dsdk.dir=/usr/local/android-sdk-linux",
"-Dkey.store=/keys/android-release-garagekey.keystore",
"-Dkey.alias=garagekey",
$mode;
19 changes: 19 additions & 0 deletions devenv/Dockerfile
@@ -0,0 +1,19 @@
# Build environment in which to build the garage door app.
#
# This extends the Dockerfile from https://index.docker.io/u/wasabeef/android/

FROM wasabeef/android
MAINTAINER bradfitz <brad@danga.com>

# Found these from: android list sdk -u -e
RUN android list sdk -u -e | grep build-tools- | perl -npe 's/.+"(.+)"/$1/' > /tmp/build-tools-version
RUN perl -e 'die "No Android build tools version found." unless -s "/tmp/build-tools-version"'
RUN echo y | android update sdk -u -t $(cat /tmp/build-tools-version)
RUN echo y | android update sdk -u -t android-17

ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANT_HOME /usr/local/apache-ant-1.9.2
ENV PATH $PATH:$ANDROID_HOME/tools
ENV PATH $PATH:$ANDROID_HOME/platform-tools
ENV PATH $PATH:$ANT_HOME/bin
ENV IN_DOCKER 1

0 comments on commit dbb9e95

Please sign in to comment.