Skip to content

Commit

Permalink
Merge pull request #12 from soramitsu/feature/fix-docker-custom-files
Browse files Browse the repository at this point in the history
Fix docker
  • Loading branch information
Warchant authored Jun 30, 2019
2 parents 96983cf + 5333cd1 commit 6a2e54f
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions src/main/groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,13 @@ class DockerPlugin implements Plugin<Project> {
-XX:MaxRAMFraction=\${MAX_RAM_FRACTION} -XX:+UseContainerSupport \\
-XX:+PrintFlagsFinal -XshowSettings:vm \${JAVA_OPTIONS}"
"""
def customFiles = dockerConfig.files
if (customFiles == null || customFiles.isEmpty()) {
return
}

// copy files from context dir to dst
customFiles.each { _, dst ->
// remove leading slash from path
def from = dst.replaceAll(/^\//, '')
t.copyFile(from, dst)
if (dockerConfig.files != null) {
// copy files from context dir to dst
dockerConfig.files.each { _, dst ->
// remove leading slash from path
def from = dst.replaceAll(/^\//, '')
t.copyFile(from, dst)
}
}

// copy jar
Expand Down

0 comments on commit 6a2e54f

Please sign in to comment.