mirror/libsignal
0
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 03:52:17 +02:00
Code

Docker: Remove unnecessary extra copy of rust-toolchain

Browse Source
This commit is contained in:
Jordan Rose 2020-11-19 16:20:16 -08:00
parent 57db5dcb5e
commit 99bffda143
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/Makefile
View File

@ -18,12 +18,12 @@ java_build: DOCKER_EXTRA=$(shell [ -L build ] && P=$$(readlink build) && echo -v
java_build: docker_image
$(DOCKER) run --rm --user $$(id -u):$$(id -g) \
-v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \
sh -c "cp rust-toolchain src/; cd src/java; ./gradlew build"
sh -c "cd src/java; ./gradlew build"
java_test: java_build
$(DOCKER) run --rm --user $$(id -u):$$(id -g) \
-v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \
sh -c "cp rust-toolchain src/; cd src/java; ./gradlew test"
sh -c "cd src/java; ./gradlew test"
SONATYPE_USERNAME ?=
SONATYPE_PASSWORD ?=
@ -44,7 +44,7 @@ publish_java: docker_image
-v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) \
-v $(KEYRING_VOLUME):/home/libsignal/keyring \
$(DOCKER_IMAGE) \
sh -c "cp rust-toolchain src; cd src/java; ./gradlew uploadArchives \
sh -c "cd src/java; ./gradlew uploadArchives \
-PwhisperSonatypeUsername='$(SONATYPE_USERNAME)' \
-PwhisperSonatypePassword='$(SONATYPE_PASSWORD)' \
-Psigning.secretKeyRingFile='/home/libsignal/keyring/$(KEYRING_FILE_ROOT)' \