Skip to content

Commit

Permalink
Upgrade gradle version.
Browse files Browse the repository at this point in the history
Peer authentication to jitpack.io fails with JDK 7 / Gradle 2.10 (jitpack/jitpack.io#423).
  • Loading branch information
flibbertigibbet committed Feb 20, 2016
1 parent f331a51 commit cf4facc
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
2 changes: 2 additions & 0 deletions gradle/.gitignore
@@ -1,2 +1,4 @@
build/
.gradle/
*.jar

33 changes: 12 additions & 21 deletions gradle/Dockerfile
Expand Up @@ -6,52 +6,43 @@
FROM java:7-jdk
MAINTAINER Kathryn Killebrew <kkillebrew@azavea.com>

RUN dpkg apt-get update && \
RUN apt-get update && \
apt-get install -yq ca-certificates ca-certificates-java

# Gradle
ENV GRADLE_VERSION 2.7
ENV GRADLE_HASH fe801ce2166e6c5b48b3e7ba81277c41
# install gradle
ENV GRADLE_VERSION 2.11
ENV GRADLE_HASH 8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6
WORKDIR /usr/lib
RUN wget https://downloads.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip
RUN echo "${GRADLE_HASH} gradle-${GRADLE_VERSION}-bin.zip" > gradle-${GRADLE_VERSION}-bin.zip.md5
RUN md5sum -c gradle-${GRADLE_VERSION}-bin.zip.md5
RUN sha256sum -c gradle-${GRADLE_VERSION}-bin.zip.md5
RUN unzip "gradle-${GRADLE_VERSION}-bin.zip"
RUN ln -s "/usr/lib/gradle-${GRADLE_VERSION}/bin/gradle" /usr/bin/gradle
RUN rm "gradle-${GRADLE_VERSION}-bin.zip"
RUN mkdir -p /usr/src/app

# Set Appropriate Environmental Variables
# set gradle environment
ENV GRADLE_HOME /usr/src/gradle
ENV PATH $PATH:$GRADLE_HOME/bin

# Caches
ENV TERM dumb
VOLUME /root/.gradle/caches

# Download and untar SDK
# Download and untar Android SDK
ENV ANDROID_SDK_URL http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
RUN curl -L "${ANDROID_SDK_URL}" | tar --no-same-owner -xz -C /usr/local
ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANDROID_SDK /usr/local/android-sdk-linux
ENV PATH ${ANDROID_HOME}/tools:$ANDROID_HOME/platform-tools:$PATH

# Install Android SDK components
# Install Android SDK components (only need dx.jar, from build tools)
ENV ANDROID_SDK_COMPONENTS build-tools-23.0.2
RUN echo y | android update sdk --no-ui --all --filter "${ANDROID_SDK_COMPONENTS}"

# set environment variable with path to dx.jar
ENV DX_JAR_PATH /usr/local/android-sdk-linux/build-tools/23.0.2/lib/dx.jar

# Support Gradle
ENV TERM dumb

# Default command is "/usr/bin/gradle -version" on /usr/bin/app dir
# (ie. Mount project at /usr/bin/app "docker --rm -v /path/to/app:/usr/bin/app gradle <command>")
# set up working directory
RUN mkdir -p /usr/src/app
VOLUME /usr/bin/app
WORKDIR /usr/bin/app
ENTRYPOINT gradle
CMD -version

# TODO: sign with jarsigner:
# http://developer.android.com/tools/publishing/app-signing.html

CMD ./run.sh
11 changes: 11 additions & 0 deletions gradle/run.sh
@@ -0,0 +1,11 @@
#!/bin/sh

set -e

echo 'Going to build new model jarfile...'
gradle clean assemble dexify
echo 'Model jarfile built.'

# TODO: sign with jarsigner:
# http://developer.android.com/tools/publishing/app-signing.html

0 comments on commit cf4facc

Please sign in to comment.