mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-14 03:48:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into wip-android

Browse source
This commit is contained in:
dpad85 2017-12-06 16:31:50 +01:00
commit 744a328134
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -36,8 +36,8 @@ RUN mvn install -pl eclair-node -am clean
# Only then do we copy the sources
COPY . .
# And this time we can build in offline mode
RUN mvn package -pl eclair-node -am -DskipTests -o
# And this time we can build in offline mode, specifying 'notag' instead of git commit
RUN mvn package -pl eclair-node -am -DskipTests -Dgit.commit.id=notag -Dgit.commit.id.abbrev=notag -o
# It might be good idea to run the tests here, so that the docker build fail if the code is bugged
# We currently use a debian image for runtime because of some jni-related issue with sqlite

3
pom.xml
View file

@ -46,9 +46,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<!-- default tag used when building without git -->
<git.commit.id>notag</git.commit.id>
<git.commit.id.abbrev>notag</git.commit.id.abbrev>
<scala.version>2.11.11</scala.version>
<scala.version.short>2.11</scala.version.short>
<akka.version>2.3.14</akka.version>