Skip to content

Commit e389832

Browse files
committed
migrate to custom plugin
1 parent 9426bcd commit e389832

File tree

2 files changed

+7
-38
lines changed

2 files changed

+7
-38
lines changed

docker/datahub-ingestion-base/build.gradle

+3-18
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id 'com.palantir.docker'
32
id 'java' // required for versioning
43
}
54

65
apply from: "../../gradle/versioning/versioning.gradle"
6+
apply from: "../../gradle/docker/docker.gradle"
77

88
ext {
99
docker_registry = rootProject.ext.docker_registry == 'linkedin' ? 'acryldata' : docker_registry
@@ -16,8 +16,9 @@ ext {
1616
}
1717

1818
docker {
19+
dependsOn build
1920
name "${docker_registry}/${docker_repo}:v${docker_version}"
20-
version "v${docker_version}"
21+
//version "v${docker_version}"
2122
dockerfile file("${rootProject.projectDir}/docker/${docker_dir}/Dockerfile")
2223
files fileTree(rootProject.projectDir) {
2324
include '.dockerignore'
@@ -44,19 +45,3 @@ docker {
4445

4546
buildArgs(dockerBuildArgs)
4647
}
47-
tasks.getByName('docker').dependsOn('build')
48-
49-
task mkdirBuildDocker {
50-
doFirst {
51-
mkdir "${project.buildDir}/docker"
52-
}
53-
}
54-
dockerClean.finalizedBy(mkdirBuildDocker)
55-
dockerClean.dependsOn([':docker:datahub-ingestion:dockerClean'])
56-
57-
task cleanLocalDockerImages {
58-
doLast {
59-
rootProject.ext.cleanLocalDockerImages(docker_registry, docker_repo, "${version}")
60-
}
61-
}
62-
dockerClean.finalizedBy(cleanLocalDockerImages)

docker/datahub-ingestion/build.gradle

+4-20
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id 'com.palantir.docker'
32
id 'java' // required for versioning
43
}
54

65
apply from: "../../gradle/versioning/versioning.gradle"
6+
apply from: "../../gradle/docker/docker.gradle"
77

88
ext {
99
docker_registry = rootProject.ext.docker_registry == 'linkedin' ? 'acryldata' : docker_registry
@@ -21,8 +21,8 @@ dependencies {
2121
}
2222

2323
docker {
24+
dependsOn 'build', ':docker:datahub-ingestion-base:docker', ':metadata-ingestion:codegen'
2425
name "${docker_registry}/${docker_repo}:v${docker_version}"
25-
version "v${docker_version}"
2626
dockerfile file("${rootProject.projectDir}/docker/${docker_dir}/Dockerfile${docker_target == "slim" ? "-slim-only" : ""}")
2727
files fileTree(rootProject.projectDir) {
2828
include '.dockerignore'
@@ -32,7 +32,8 @@ docker {
3232
}.exclude {
3333
i -> (!i.file.name.endsWith(".dockerignore") && i.file.isHidden())
3434
}
35-
35+
36+
version "v${docker_version}"
3637
def dockerBuildArgs = [DOCKER_VERSION: version, RELEASE_VERSION: version.replace('-SNAPSHOT', '').replace('v', '').replace("-slim", ''), BASE_IMAGE: "${docker_registry}/datahub-ingestion-base"]
3738

3839
// Add build args if they are defined (needed for some CI or enterprise environments)
@@ -45,20 +46,3 @@ docker {
4546

4647
buildArgs(dockerBuildArgs)
4748
}
48-
tasks.getByName('dockerPrepare').dependsOn(['build',
49-
':docker:datahub-ingestion-base:docker',
50-
':metadata-ingestion:codegen'])
51-
52-
task mkdirBuildDocker {
53-
doFirst {
54-
mkdir "${project.buildDir}/docker"
55-
}
56-
}
57-
dockerClean.finalizedBy(mkdirBuildDocker)
58-
59-
task cleanLocalDockerImages {
60-
doLast {
61-
rootProject.ext.cleanLocalDockerImages(docker_registry, docker_repo, "${version}")
62-
}
63-
}
64-
dockerClean.finalizedBy(cleanLocalDockerImages)

0 commit comments

Comments
 (0)