Skip to content

Commit

Permalink
Use the AuthConfigReader of the docker-engine dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
gesellix committed Sep 26, 2021
1 parent d2d4ba6 commit 182933c
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 775 deletions.
20 changes: 20 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,26 @@ allprojects {
}
}

subprojects {
repositories {
// mavenLocal()
// listOf(
// "docker-client/docker-engine"
// ).forEach { repo ->
// fun findProperty(s: String) = project.findProperty(s) as String?
// maven {
// name = "github"
// setUrl("https://maven.pkg.github.com/$repo")
// credentials {
// username = System.getenv("PACKAGE_REGISTRY_USER") ?: findProperty("github.package-registry.username")
// password = System.getenv("PACKAGE_REGISTRY_TOKEN") ?: findProperty("github.package-registry.password")
// }
// }
// }
mavenCentral()
}
}

fun findProperty(s: String) = project.findProperty(s) as String?

val isSnapshot = project.version == "unspecified"
Expand Down
6 changes: 1 addition & 5 deletions client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ plugins {
id("io.freefair.maven-central.validate-poms")
}

repositories {
mavenCentral()
}

dependencies {
constraints {
implementation("org.slf4j:slf4j-api") {
Expand Down Expand Up @@ -68,7 +64,7 @@ dependencies {
}
}

api("de.gesellix:docker-engine:2021-09-26T13-30-00")
api("de.gesellix:docker-engine:2021-09-26T18-50-00")
api("de.gesellix:docker-compose:2021-09-21T08-00-00")

implementation("org.codehaus.groovy:groovy:[2.5,)")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package de.gesellix.docker.client.authentication

import com.squareup.moshi.Moshi
import de.gesellix.docker.authentication.AuthConfig
import de.gesellix.docker.authentication.AuthConfigReader
import de.gesellix.docker.authentication.CredsStore
import de.gesellix.docker.client.distribution.ReferenceParser
import de.gesellix.docker.client.registry.RegistryElection
import de.gesellix.docker.client.system.ManageSystem
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.gesellix.docker.client.registry

import de.gesellix.docker.client.authentication.AuthConfig
import de.gesellix.docker.authentication.AuthConfig
import de.gesellix.docker.client.authentication.ManageAuthentication
import de.gesellix.docker.client.system.ManageSystem
import de.gesellix.docker.engine.DockerEnv
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 182933c

Please sign in to comment.