Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dockerPackageMappings to be absolute paths #1305

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix dockerPackageMappings to be absolute paths #1305

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38a70df
Fix dockerPackageMappings to be absolute paths
joan38 Feb 5, 2020
b7e4d69
Merge branch 'master' into docker-mappings
muuki88 Feb 20, 2020
59d5fc6
Merge branch 'master' into docker-mappings
muuki88 Oct 21, 2020
c5ec425
Merge branch 'master' into docker-mappings
muuki88 Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.typesafe.sbt.packager.docker

import java.io.File
import java.nio.file.Paths
import java.util.UUID
import java.util.concurrent.atomic.AtomicBoolean

Expand Down Expand Up @@ -251,7 +252,9 @@ object DockerPlugin extends AutoPlugin {
validateDockerVersion(dockerApiVersion.value),
validateDockerPermissionStrategy(dockerPermissionStrategy.value, dockerVersion.value, dockerApiVersion.value)
),
dockerPackageMappings := MappingsHelper.contentOf(sourceDirectory.value),
dockerPackageMappings := MappingsHelper
.contentOf(sourceDirectory.value)
.map { case (from, to) => from -> Paths.get("/", to).toString },
dockerGenerateConfig := {
val _ = validatePackage.value
generateDockerConfig(dockerCommands.value, stagingDirectory.value)
Expand Down