[docker-circle] refs skycoin#75 Change dist and install deps `make in…

…stall-deps-skyapi-Linux`
simelo · Jun 27, 2019 · 8c133e3 · 8c133e3
1 parent 0c2241f
commit 8c133e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/docker/images/deploy-arm/Dockerfile b/docker/images/deploy-arm/Dockerfile
@@ -1,5 +1,5 @@
 ARG QEMU_PLATFORM
-FROM balenalib/${QEMU_PLATFORM}-debian-golang
+FROM balenalib/${QEMU_PLATFORM}-ubuntu-golang
 
 ARG GITHUB_OAUTH_TOKEN
 ARG PROJECT_USERNAME
@@ -10,17 +10,18 @@ ADD . $GOPATH/src/github.com/skycoin/libskycoin/
 RUN [ "cross-build-start" ]
 
 RUN ls -oa $GOPATH/src/github.com/skycoin/libskycoin/
-RUN sh $GOPATH/src/github.com/skycoin/libskycoin/ci-scripts/docker_install_debian.sh
+RUN sh $GOPATH/src/github.com/skycoin/libskycoin/ci-scripts/docker_install_ubuntu.sh
 RUN make -C $GOPATH/src/github.com/skycoin/libskycoin dep
+RUN make -C $GOPATH/src/github.com/skycoin/libskycoin install-deps-skyapi-Linux
 RUN go get github.com/gz-c/gox
 RUN go get -t ./...
 ENV CGO_ENABLED=1
-RUN export VERSION="$(git describe --tags --exact-match HEAD 2> /dev/null)"
+RUN export VERSION="$(git tag -l --points-at HEAD)"
 RUN export ARCH="$(uname -m)"
 RUN export OS="$(uname -s)"
 RUN make -C $GOPATH/src/github.com/skycoin/libskycoin build
-RUN tar -c -z -f libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz -C $GOPATH/src/github.com/skycoin/libskycoin/build $GOPATH/src/github.com/skycoin/libskycoin/build/*
+RUN tar -czf libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz -C $GOPATH/src/github.com/skycoin/libskycoin/build $GOPATH/src/github.com/skycoin/libskycoin/build/*
 RUN go get github.com/tcnksm/ghr
 RUN ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} -delete ${VERSION} libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz
 
-RUN [ "cross-build-end" ]
+RUN [ "cross-build-end" ]
diff --git a/docker/images/test-arm/Dockerfile b/docker/images/test-arm/Dockerfile
@@ -12,6 +12,7 @@ RUN [ "cross-build-start" ]
 RUN ls -oa $GOPATH/src/github.com/skycoin/libskycoin/
 RUN sh $GOPATH/src/github.com/skycoin/libskycoin/ci-scripts/docker_install_${QEMU_OS}.sh
 RUN make -C $GOPATH/src/github.com/skycoin/libskycoin dep
+RUN make -C $GOPATH/src/github.com/skycoin/libskycoin install-deps-skyapi-Linux
 RUN go get github.com/gz-c/gox
 RUN go get -t ./...
 ENV CGO_ENABLED=1
@@ -21,4 +22,4 @@ RUN make -C $GOPATH/src/github.com/skycoin/libskycoin test-libc
 RUN [ "cross-build-end" ]
 
 WORKDIR $GOPATH/src/github.com/skycoin
-VOLUME $GOPATH/src/
+VOLUME $GOPATH/src/