Skip to content

Commit 31fe8d2

Browse files
committed
CATCH_DEV_LIB
1 parent 6d553ee commit 31fe8d2

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
opt
2-
opt.7z
1+
catch-dev-libs*

Dockerfile

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Development environment for CatchLabs.
2-
# Version 0.4.0
32

43
FROM debian:sid
54

@@ -50,17 +49,22 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
5049

5150
#################################
5251
#
53-
# Android SDK (build-tools)
52+
# Libs
5453
#
5554
################################
5655

56+
ENV CATCH_DEV_LIB_VERSION 1
57+
RUN curl -SLO "https://dn-catch-static.qbox.me/dev/catch-dev-libs-v$CATCH_DEV_LIB_VERSION.tar.xz" \
58+
&& tar -xJf "catch-dev-libs-v$CATCH_DEV_LIB_VERSION.tar.xz" -C /opt --strip-components=1 \
59+
&& rm "catch-dev-libs-v$CATCH_DEV_LIB_VERSION.tar.xz"
60+
5761
ENV ANDROID_SDK_HOME /opt/android-sdk
58-
ENV PATH $PATH:$ANDROID_SDK_HOME/build-tools
62+
ENV PATH $PATH:$ANDROID_SDK_HOME/build-tools/24.0.0
5963

6064
#################################
6165
#
6266
# Env for CatchLabs
6367
#
6468
#################################
6569

66-
ENV CATCH_DEV_VERSION 0.5.0
70+
ENV CATCH_DEV_VERSION 0.6.0

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
Development environment for CatchLabs.
44

55
- Node.js v6.3.0
6+
- Android Build Tools 24.0.0 (aapt, zipalign...)
67

78
## Build
89

910
```bash
10-
docker build -t="catchlabs/dev" github.com/CatchLabs/docker-catch-dev
11+
docker build -t="catchlabs/dev" .
1112
```
1213

1314
## Usage

upload-libs.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CATCH_DEV_LIB_VERSION=1
2+
tar -Jcvf catch-dev-libs-v$CATCH_DEV_LIB_VERSION.tar.xz catch-dev-libs
3+
scp catch-dev-libs-v$CATCH_DEV_LIB_VERSION.tar.xz [email protected]:/srv/web/static.catch.cc/dev

0 commit comments

Comments
 (0)