diff --git a/appengine_war.gradle b/appengine_war.gradle index 45d61cc29..a8f15eb11 100644 --- a/appengine_war.gradle +++ b/appengine_war.gradle @@ -90,7 +90,6 @@ explodeWar.doLast { appengineDeployAll.mustRunAfter ':console-webapp:deploy' appengineDeployAll.finalizedBy ':deployCloudSchedulerAndQueue' -rootProject.deploy.dependsOn appengineDeployAll rootProject.stage.dependsOn appengineStage tasks['war'].dependsOn ':core:processResources' diff --git a/console-webapp/build.gradle b/console-webapp/build.gradle index f0c04c988..7f8c4c4d4 100644 --- a/console-webapp/build.gradle +++ b/console-webapp/build.gradle @@ -101,16 +101,9 @@ task checkFormatting(type: Exec) { args 'run', 'prettify:check' } -task deploy(type: Exec) { - workingDir "${consoleDir}/staged" - executable 'gcloud' - args 'app', 'deploy', "${projectParam}", '--quiet' -} - tasks.buildConsoleWebapp.dependsOn(tasks.npmInstallDeps) tasks.runConsoleWebappUnitTests.dependsOn(tasks.npmInstallDeps) tasks.applyFormatting.dependsOn(tasks.npmInstallDeps) tasks.checkFormatting.dependsOn(tasks.npmInstallDeps) tasks.build.dependsOn(tasks.checkFormatting) tasks.build.dependsOn(tasks.runConsoleWebappUnitTests) -tasks.deploy.dependsOn(tasks.buildConsoleWebapp) diff --git a/jetty/build.gradle b/jetty/build.gradle index aa43bf166..c3e67aba3 100644 --- a/jetty/build.gradle +++ b/jetty/build.gradle @@ -50,7 +50,7 @@ tasks.register('stage') { } tasks.register('buildNomulusImage', Exec) { - commandLine 'docker', 'build', '-t', 'nomulus', '.' + commandLine 'docker', 'build', '-t', 'nomulus', '.', '--pull' dependsOn(tasks.named('stage')) } @@ -137,3 +137,4 @@ tasks.register('getEndpoints', Exec) { } project.build.dependsOn(tasks.named('buildNomulusImage')) +rootProject.deploy.dependsOn(tasks.named('deployNomulus')) diff --git a/proxy/build.gradle b/proxy/build.gradle index 960f7cf88..3678870bc 100644 --- a/proxy/build.gradle +++ b/proxy/build.gradle @@ -15,7 +15,7 @@ createUberJar('deployJar', 'proxy_server', 'google.registry.proxy.ProxyServer') task buildProxyImage(dependsOn: deployJar, type: Exec) { - commandLine 'docker', 'build', '-t', 'proxy', '.' + commandLine 'docker', 'build', '-t', 'proxy', '.', '--pull' } task tagProxyImage(dependsOn: buildProxyImage, type: Exec) {