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

Revert #4601 / #4624 so that docker works on umbrel again (#4665)

Browse source 
* Revert #4601 / #4624 so that docker works on umbrel again

* Fix
This commit is contained in:
Chris Stewart 2022-08-25 11:21:29 -05:00 • committed by GitHub
parent a5186cd1da
commit ac24bfb230
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,16 +20,6 @@ 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
//for the oracle server
//this is needed for umbrel
//https://linuxize.com/post/chmod-command-in-linux/#symbolic-text-method
dockerAdditionalPermissions += (DockerChmodType.Custom(
"a=rx"), "/opt/docker/bin/bitcoin-s-oracle-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 conf file //you can override this by passing in a custom conf file
//when the docker container is started by using bind mount //when the docker container is started by using bind mount

3
app/server/server.sbt
View file

@ -23,9 +23,6 @@ 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

4
project/CommonSettings.scala
View file

@ -194,6 +194,10 @@ object CommonSettings {
dockerBaseImage := "openjdk:17-slim", dockerBaseImage := "openjdk:17-slim",
dockerRepository := Some("bitcoinscala"), dockerRepository := Some("bitcoinscala"),
Docker / daemonUser := "bitcoin-s", Docker / daemonUser := "bitcoin-s",
//needed for umbrel environment, container uids and host uids must matchup so we can
//properly write to volumes on the host machine
//see: https://medium.com/@mccode/understanding-how-uid-and-gid-work-in-docker-containers-c37a01d01cf
Docker / daemonUserUid := Some("1000"),
Docker / packageName := packageName.value, Docker / packageName := packageName.value,
Docker / version := version.value, Docker / version := version.value,
dockerUpdateLatest := isSnapshot.value dockerUpdateLatest := isSnapshot.value