Commit 3cb6b630 authored by Mygod's avatar Mygod

Move Dockerfile

parent 28a73c90
FROM circleci/android:api-28-alpha
# NDK see also: https://github.com/CircleCI-Public/circleci-dockerfiles/blob/cb8bda793023d3e919ea5553e2f2c04b71f53c49/android/images/api-28-ndk/Dockerfile#L181
ARG ndk_version=android-ndk-r19
ARG go_version=1.11
ARG android_ndk_home=/opt/android/${ndk_version}
# install NDK
RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/${ndk_version}.zip https://dl.google.com/android/repository/${ndk_version}-linux-x86_64.zip && \
sudo unzip -q /tmp/${ndk_version}.zip -d /opt/android && \
rm /tmp/${ndk_version}.zip && \
sudo chown -R circleci:circleci ${android_ndk_home}
ENV ANDROID_NDK_HOME ${android_ndk_home}
RUN \
curl --silent --show-error --location --fail --retry 3 --output /tmp/go${go_version}.tgz "https://golang.org/dl/go${go_version}.linux-amd64.tar.gz" && \
sudo tar -C /usr/local -xzf /tmp/go${go_version}.tgz; \
rm /tmp/go${go_version}.tgz
ENV PATH /usr/local/go/bin:$PATH
...@@ -3,7 +3,7 @@ jobs: ...@@ -3,7 +3,7 @@ jobs:
build: build:
working_directory: ~/code working_directory: ~/code
docker: docker:
- image: shadowsocks/shadowsocks-android:circleci - image: shadowsocks/android-ndk-go
environment: environment:
JVM_OPTS: -Xmx3500m JVM_OPTS: -Xmx3500m
GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process"
......
...@@ -7,7 +7,7 @@ services: ...@@ -7,7 +7,7 @@ services:
- docker - docker
before_install: before_install:
- docker pull shadowsocks/shadowsocks-android:circleci - docker pull shadowsocks/android-ndk-go
- chmod -R a+wrx . - chmod -R a+wrx .
script: script:
......
...@@ -32,7 +32,7 @@ You can check whether the latest commit builds under UNIX environment by checkin ...@@ -32,7 +32,7 @@ You can check whether the latest commit builds under UNIX environment by checkin
```bash ```bash
mkdir build mkdir build
sudo chown 3434:3434 build sudo chown 3434:3434 build
docker run --rm -v ${PWD}/build:/build shadowsocks/shadowsocks-android:circleci bash -c "cd /build; git clone https://github.com/shadowsocks/shadowsocks-android; cd shadowsocks-android; git submodule update --init --recursive; ./gradlew assembleDebug" docker run --rm -v ${PWD}/build:/build shadowsocks/android-ndk-go bash -c "cd /build; git clone https://github.com/shadowsocks/shadowsocks-android; cd shadowsocks-android; git submodule update --init --recursive; ./gradlew assembleDebug"
``` ```
### [TRANSLATE](https://discourse.shadowsocks.org/t/poeditor-translation-main-thread/30) ### [TRANSLATE](https://discourse.shadowsocks.org/t/poeditor-translation-main-thread/30)
......
...@@ -44,7 +44,6 @@ import java.io.File ...@@ -44,7 +44,6 @@ import java.io.File
import java.io.FileDescriptor import java.io.FileDescriptor
import java.io.IOException import java.io.IOException
import java.lang.reflect.Method import java.lang.reflect.Method
import java.net.SocketException
import java.util.* import java.util.*
import android.net.VpnService as BaseVpnService import android.net.VpnService as BaseVpnService
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment