diff --git a/.github/workflows/create-deb.yml b/.github/workflows/create-deb.yml index ed0b87ba..eb783109 100644 --- a/.github/workflows/create-deb.yml +++ b/.github/workflows/create-deb.yml @@ -2,7 +2,6 @@ name: Build DEB on: push: - branches: [ master ] tags: - v[0-9].[0-9]+.[0-9]+ diff --git a/.github/workflows/create-exe.yml b/.github/workflows/create-exe.yml index 3f9ba641..8a7a1929 100644 --- a/.github/workflows/create-exe.yml +++ b/.github/workflows/create-exe.yml @@ -2,7 +2,6 @@ name: Build EXE on: push: - branches: [ master ] tags: - v[0-9].[0-9]+.[0-9]+ diff --git a/.github/workflows/create-pkg.yml b/.github/workflows/create-pkg.yml index 6e1d310c..9c9da0b3 100644 --- a/.github/workflows/create-pkg.yml +++ b/.github/workflows/create-pkg.yml @@ -2,7 +2,6 @@ name: Build PKG on: push: - branches: [ master ] tags: - v[0-9].[0-9]+.[0-9]+ diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml new file mode 100644 index 00000000..b7ccc117 --- /dev/null +++ b/.github/workflows/publish-docker.yml @@ -0,0 +1,23 @@ +name: Publish docker image + +on: + push: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + java-package: jdk+fx + - uses: azure/docker-login@v1 + with: + username: karasiq + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Publish docker image + run: | + sbt consoleApp/docker:publish diff --git a/build.sbt b/build.sbt index 35cb1630..ac9d7aaa 100644 --- a/build.sbt +++ b/build.sbt @@ -74,14 +74,14 @@ lazy val dockerSettings = Seq( dockerEntrypoint ++= Seq( "-Dshadowcloud.external-config=/opt/docker/sc/shadowcloud.conf", "-Dshadowcloud.persistence.h2.path=/opt/docker/sc/shadowcloud", + "-Dshadowcloud.drive.fuse.mount-path=/opt/docker/sc/drive", + "-Dshadowcloud.drive.fuse.auto-mount=true", "-Dshadowcloud.http-server.host=0.0.0.0" ), dockerCommands := { val cmds = dockerCommands.value val injected = Seq( - Cmd("RUN", "apk", "add", "--no-cache", "bash", "fuse"), - Cmd("RUN", "echo 'user_allow_other' >> /etc/fuse.conf") - /* Cmd("RUN", "apt-get", "update", "&&", "apt-get", "install", "-y", "fuse")*/ + Cmd("RUN", "apk", "add", "--no-cache", "bash", "fuse") ) cmds.takeWhile(!_.makeContent.startsWith("USER")) ++ injected ++ cmds.dropWhile(!_.makeContent.startsWith("USER")) },