diff --git a/docker-compose.yml b/docker-compose.yml index 33d01a856c..93fee87cc9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,11 +23,11 @@ services: - walletserver walletserver: image: bitcoinscala/bitcoin-s-server:latest - entrypoint: ["/opt/docker/bin/bitcoin-s-server", "--datadir", "/wallet", "--conf", "/opt/docker/docker-application.conf"] + entrypoint: ["/opt/docker/bin/bitcoin-s-server", "--datadir", "/bitcoin-s", "--conf", "/opt/docker/docker-application.conf"] user: "0:1000" restart: on-failure volumes: - - ./data/wallet:/wallet + - ./data/wallet:/bitcoin-s environment: BITCOIN_S_NODE_MODE: "neutrino" BITCOIN_S_NODE_PEERS: "neutrino.suredbits.com:8333" diff --git a/project/CommonSettings.scala b/project/CommonSettings.scala index a207649d41..00feff1888 100644 --- a/project/CommonSettings.scala +++ b/project/CommonSettings.scala @@ -3,7 +3,7 @@ import com.typesafe.sbt.SbtNativePackager.Docker import com.typesafe.sbt.SbtNativePackager.autoImport.packageName import java.nio.file.Paths -import com.typesafe.sbt.packager.Keys.{daemonUser, daemonUserUid, dockerAlias, dockerAliases, dockerCommands, dockerRepository, dockerUpdateLatest, maintainer} +import com.typesafe.sbt.packager.Keys.{daemonUser, daemonUserUid, dockerAlias, dockerAliases, dockerCommands, dockerExposedVolumes, dockerRepository, dockerUpdateLatest, maintainer} import com.typesafe.sbt.packager.archetypes.jlink.JlinkPlugin.autoImport.JlinkIgnore import com.typesafe.sbt.packager.docker.{Cmd, DockerChmodType} import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport.{dockerAdditionalPermissions, dockerBaseImage} @@ -200,9 +200,8 @@ object CommonSettings { Docker / daemonUserUid := Some("1000"), Docker / packageName := packageName.value, Docker / version := version.value, - dockerCommands ++= Seq( - Cmd("RUN", "mkdir", "/wallet") - ), + //add a default exposed volume of /bitcoin-s so we can always write data here + dockerExposedVolumes += "/bitcoin-s", dockerUpdateLatest := isSnapshot.value ) }