Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

remove the docker gradle plugin, handle building docker with shell now #1644

Merged
merged 3 commits into from
Jul 4, 2019
Merged

remove the docker gradle plugin, handle building docker with shell now #1644

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef20cc4
remove the docker gradle plugin, handle with shell now
joshuafernandes Jul 4, 2019
e6e9c28
pr fixes
joshuafernandes Jul 4, 2019
cf21362
Merge branch 'master' into fix-docker-plugin
joshuafernandes Jul 4, 2019
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
Prev Previous commit
Next Next commit
pr fixes
  • Loading branch information
@joshuafernandes
joshuafernandes committed Jul 4, 2019
commit e6e9c286290b76e4314b7e878ba59dad3c5a9a29
12 changes: 10 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,8 @@ distZip {
// simple for use in docker
tasks.register("dockerDistUntar") {
dependsOn distTar
def dockerBuildDir = "kubernetes/"
dependsOn distZip
def dockerBuildDir = "build/docker-pantheon/"
def distTarFile = distTar.outputs.files.singleFile
def distTarFileName = distTar.outputs.files.singleFile.name.replace(".tar.gz", "")

Expand All @@ -498,9 +499,16 @@ task distDocker(type: Exec) {
dependsOn dockerDistUntar
def image_tag = "develop"
def image="pegasyseng/pantheon-kubernetes:${image_tag}"
def dockerBuildDir = "kubernetes/"
def dockerBuildDir = "build/docker-pantheon/"
workingDir "${dockerBuildDir}"

doFirst {
copy {
from file("${projectDir}/kubernetes/Dockerfile")
into(workingDir)
}
}

executable "sh"
args "-c", "docker build --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${rootProject.version} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ."
}
Expand Down