From da18b4e8ff13153234531f9dffdb929e17a21921 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 22 Mar 2021 18:32:05 -0700 Subject: [PATCH] update readme for 2021.03 version --- Dockerfile | 2 -- README.md | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44b8aee..6c91028 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,5 +94,3 @@ RUN go get golang.org/x/mobile/cmd/gobind RUN go get golang.org/x/mobile/bind RUN gomobile clean -# RUN gomobile init - diff --git a/README.md b/README.md index b1b90eb..8db3dbf 100644 --- a/README.md +++ b/README.md @@ -13,20 +13,21 @@ Versions are: ## Install and Use -### Version 2018.07 +### Version 2021.03 This image includes: -- Android SDK, NDK, tools, and API version 28 at `/usr/local/android-sdk` +- Android SDK, NDK, tools, and API version 29 and Buildtools 30.0.2 at `/usr/local/android-sdk` - Go lang 1.10.3 at `/usr/local/go` -- $GOPATH set to `/workspace/go` -- A go directory with an initialized gomobile installed at `/go` +- $GOPATH set to `/gomobile` + - GOPATH includes gomobile cmd tools and source -This image comes with gomobile checkedout and preinitialized (time and space consuming). In order to install this predone work from the image into your Drone CI workspace (a docker volume mounted to `/workspace`), you will want your first pipeline step to be: +This container has its own GOPATH with only gomobile in it, so to use, you'll need to re-get your go dependancies and then run `gomobile init`. The following example shows a Drone CI step using this image - go-link: - image: openpriv/android-go-mobile + gomobile-build: + image: openpriv/android-go-mobile:2021.03 commands: - - cp -as /go /workspace/go + - go mod download + - gomobile init + - make -`cp -as` recreates the directory structure from /go in /workspace/go but for each file, it just creates a symlink. This is the quickest and most efficent way to mirror the work supplied with the image into your workspace.