Remove dockerAllPush task

palantir · Jan 3, 2019 · c07a471 · c07a471
1 parent 86a4ffd
commit c07a471
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 45 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,11 +7,23 @@ plugins {
     id 'groovy'
     id 'idea'
     id 'java-gradle-plugin'
-    id 'maven-publish'
+    id 'nebula.maven-publish' version '5.1.5'
+    id "nebula.maven-base-publish" version "5.1.5"
+    id 'nebula.source-jar' version '5.1.5'
 }
 
 repositories {
     jcenter()
+    mavenCentral()
+    maven { url "http://maven.aliyun.com/nexus/content/repositories/central" }
+    maven {
+        url "https://nexus.bybutter.com/repository/maven-public/"
+        credentials {
+            username System.getenv('NEXUS_USERNAME')
+            password System.getenv('NEXUS_PASSWORD')
+        }
+    }
+    maven { url 'https://jitpack.io' }
 }
 
 
@@ -27,68 +39,61 @@ if (System.env.CIRCLE_TEST_REPORTS) {
     test.reports.junitXml.destination = new File(System.env.CIRCLE_TEST_REPORTS, getName())
 }
 
-group 'com.palantir.gradle.docker'
-version System.env.CIRCLE_TAG ?: gitVersion()
+group 'com.bybutter.gradle.docker'
+version '0.20.5'
 
 sourceCompatibility = 1.7
 
-task sourceJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier 'sources'
-}
-
-publishing {
-    publications {
-        bintray(MavenPublication) {
-            from components.java
-            artifact(sourceJar)
-            artifact(publishPluginJavaDocsJar)
-        }
-    }
-}
-
-bintray {
-    user = System.env.BINTRAY_USERNAME
-    key = System.env.BINTRAY_PASSWORD
-    publish = true
-    pkg {
-        repo = 'releases'
-        name = 'gradle-docker'
-        userOrg = 'palantir'
-        licenses = ['Apache-2.0']
-        publications = ['bintray']
-    }
-}
-
-bintrayUpload.dependsOn 'generatePomFileForBintrayPublication', 'sourceJar', 'build'
-
-bintrayUpload.onlyIf {
-    project.version ==~ /[0-9]+(\.[0-9]+)+((-(beta|rc)[0-9]{1,2})(\.[0-9])?)?/
-}
-
 pluginBundle {
-    website = 'https://github.com/palantir/gradle-docker'
-    vcsUrl = 'https://github.com/palantir/gradle-docker'
+    website = 'https://github.com/higankanshi/gradle-docker'
+    vcsUrl = 'https://github.com/higankanshi/gradle-docker'
     description = 'Gradle Docker is a simple docker orchestrator for executing docker build and push from within Gradle.'
     tags = ['docker']
 
     plugins {
         dockerPlugin {
-            id = 'com.palantir.docker'
+            id = 'com.bybutter.docker'
             displayName = 'Palantir Gradle Docker'
         }
         dockerComposePlugin {
-            id = 'com.palantir.docker-compose'
+            id = 'com.bybutter.docker-compose'
             displayName = 'Palantir Gradle Docker-Compose'
         }
         dockerRunPlugin {
-            id = 'com.palantir.docker-run'
+            id = 'com.bybutter.docker-run'
             displayName = 'Palantir Gradle Docker-Run'
         }
     }
 }
 
-publishPlugins.onlyIf {
-    project.version ==~ /\d+\.\d+\.\d+/
+gradlePlugin {
+    plugins {
+        dockerPlugin {
+            id = 'com.bybutter.docker'
+            implementationClass = "com.palantir.gradle.docker.PalantirDockerPlugin"
+        }
+        dockerComposePlugin {
+            id = 'com.bybutter.docker-compose'
+            implementationClass = "com.palantir.gradle.docker.DockerComposePlugin"
+        }
+        dockerRunPlugin {
+            id = 'com.bybutter.docker-run'
+            implementationClass = "com.palantir.gradle.docker.DockerRunPlugin"
+        }
+    }
 }
 
+
+publishing {
+    version version
+    repositories {
+        maven {
+            name 'maven-releases'
+            url "https://nexus.bybutter.com/repository/maven-releases/"
+            credentials {
+                username System.getenv('NEXUS_USERNAME')
+                password System.getenv('NEXUS_PASSWORD')
+            }
+        }
+    }
+}
diff --git a/readme.md b/readme.md
@@ -260,7 +260,6 @@ Tasks
    * `dockerPush`: push the specified image to a docker repository
    * `dockerPush<tag>`: push the `<tag>` docker image to a docker repository
    * `dockerTagsPush`: push all tagged Docker images to configured Docker Hub
-   * `dockerAllPush`: push all tagged Docker images and named Docker image to configured Docker Hub
    * `dockerPrepare`: prepare to build a docker image by copying
      dependent task outputs, referenced files, and `dockerfile` into a temporary
      directory