mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-03 18:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug where we weren't specify the bash script for each project to modify file permissions (#4625)

Browse source
This commit is contained in:
Chris Stewart 2022-08-18 08:29:10 -05:00 • committed by GitHub
parent 34c10c6c65
commit 2dad9f57b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/oracle-server/oracle-server.sbt
View file

@ -20,6 +20,9 @@ dockerExposedPorts ++= Seq(9998)
dockerEntrypoint := Seq("/opt/docker/bin/bitcoin-s-oracle-server") dockerEntrypoint := Seq("/opt/docker/bin/bitcoin-s-oracle-server")
//so the server can be read and executed by all users
dockerAdditionalPermissions += (DockerChmodType.Custom("a=rx"),"/opt/docker/bin/bitcoin-s-oracle-server")
//make it so all users can execute the startup script //make it so all users can execute the startup script
//for the oracle server //for the oracle server
//this is needed for umbrel //this is needed for umbrel

6
app/server/server.sbt
View file

@ -1,3 +1,4 @@
import com.typesafe.sbt.packager.docker.DockerChmodType
name := s"bitcoin-s-server" name := s"bitcoin-s-server"
Universal / packageName := { Universal / packageName := {
@ -22,8 +23,13 @@ dockerExposedPorts ++= Seq(9999, 19999)
dockerEntrypoint := Seq("/opt/docker/bin/bitcoin-s-server") dockerEntrypoint := Seq("/opt/docker/bin/bitcoin-s-server")
//so the server can be read and executed by all users
dockerAdditionalPermissions += (DockerChmodType.Custom("a=rx"),"/opt/docker/bin/bitcoin-s-server")
//this passes in our default configuration for docker //this passes in our default configuration for docker
//you can override this by passing in a custom configuration //you can override this by passing in a custom configuration
//when the docker container is started by using bind mount //when the docker container is started by using bind mount
//https://docs.docker.com/storage/bind-mounts/#start-a-container-with-a-bind-mount //https://docs.docker.com/storage/bind-mounts/#start-a-container-with-a-bind-mount
dockerCmd ++= Seq("--conf", "/opt/docker/docker-application.conf") dockerCmd ++= Seq("--conf", "/opt/docker/docker-application.conf")

1
project/CommonSettings.scala
View file

@ -193,7 +193,6 @@ object CommonSettings {
//https://sbt-native-packager.readthedocs.io/en/latest/formats/docker.html //https://sbt-native-packager.readthedocs.io/en/latest/formats/docker.html
dockerBaseImage := "openjdk:17-slim", dockerBaseImage := "openjdk:17-slim",
dockerRepository := Some("bitcoinscala"), dockerRepository := Some("bitcoinscala"),
dockerAdditionalPermissions += (DockerChmodType.Custom("a=rx"),"/opt/docker/bin/bitcoin-s-server"),
Docker / packageName := packageName.value, Docker / packageName := packageName.value,
Docker / version := version.value, Docker / version := version.value,
dockerUpdateLatest := isSnapshot.value dockerUpdateLatest := isSnapshot.value