From ac24bfb23019f16210bed5aa46606d6751e8666e Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Thu, 25 Aug 2022 11:21:29 -0500 Subject: [PATCH] Revert #4601 / #4624 so that docker works on umbrel again (#4665) * Revert #4601 / #4624 so that docker works on umbrel again * Fix --- app/oracle-server/oracle-server.sbt | 10 ---------- app/server/server.sbt | 3 --- project/CommonSettings.scala | 4 ++++ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/oracle-server/oracle-server.sbt b/app/oracle-server/oracle-server.sbt index 834d1538a5..73ad94b570 100644 --- a/app/oracle-server/oracle-server.sbt +++ b/app/oracle-server/oracle-server.sbt @@ -20,16 +20,6 @@ dockerExposedPorts ++= Seq(9998) 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 //you can override this by passing in a custom conf file //when the docker container is started by using bind mount diff --git a/app/server/server.sbt b/app/server/server.sbt index acda255e0c..ba1bfba395 100644 --- a/app/server/server.sbt +++ b/app/server/server.sbt @@ -23,9 +23,6 @@ dockerExposedPorts ++= Seq(9999, 19999) 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 //you can override this by passing in a custom configuration //when the docker container is started by using bind mount diff --git a/project/CommonSettings.scala b/project/CommonSettings.scala index f29ae80db6..ff2ffd9ce4 100644 --- a/project/CommonSettings.scala +++ b/project/CommonSettings.scala @@ -194,6 +194,10 @@ object CommonSettings { dockerBaseImage := "openjdk:17-slim", dockerRepository := Some("bitcoinscala"), 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 / version := version.value, dockerUpdateLatest := isSnapshot.value