Bmoric/remove docker compose for build

airbyte-config/init/.dockerignore

@@ -1,3 +1,5 @@
 *
 !src
 !scripts
+!build
+!Dockerfile

airbyte-config/init/build.gradle

@@ -1,9 +1,23 @@
+import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
+
 plugins {
     id 'java'
+    id 'com.bmuschko.docker-remote-api'
 }
 
 dependencies {
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation project(':airbyte-config:models')
 }
+
+def buildTag = System.getenv('VERSION') ?: 'dev'
+// Use task types
+task buildMyAppImage(type: DockerBuildImage) {
+    dependsOn compileTestJava
+    dependsOn jar
+    dependsOn processTestResources
+    inputDir = file('.')
+    images.add("airbyte/init:$buildTag")
+}
+build.dependsOn(buildMyAppImage)

airbyte-db/lib/.dockerignore

@@ -1,2 +1,4 @@
 *
 !src
+!Dockerfile
+!build

airbyte-db/lib/build.gradle

@@ -1,5 +1,8 @@
+import com.bmuschko.gradle.docker.tasks.image.*
+
 plugins {
     id 'java-library'
+    id 'com.bmuschko.docker-remote-api'
 }
 
 dependencies {
@@ -69,3 +72,14 @@ task(dumpJobsSchema, dependsOn: 'classes', type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     args 'jobs', 'dump_schema'
 }
+
+def buildTag = System.getenv('VERSION') ?: 'dev'
+// Use task types
+task buildMyAppImage(type: DockerBuildImage) {
+    dependsOn compileTestJava
+    dependsOn jar
+    dependsOn processTestResources
+    inputDir = file('.')
+    images.add("airbyte/db:$buildTag")
+}
+build.dependsOn(buildMyAppImage)

airbyte-migration/.dockerignore

@@ -1,3 +1,4 @@
 *
+!src
 !Dockerfile
 !build

airbyte-migration/build.gradle

@@ -1,5 +1,8 @@
+import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
+
 plugins {
     id 'application'
+    id 'com.bmuschko.docker-remote-api'
 }
 
 dependencies {
@@ -15,3 +18,18 @@ application {
     mainClass = 'io.airbyte.migrate.MigrationRunner'
 }
 
+// Use task types
+task buildMyAppImage(type: DockerBuildImage) {
+    dependsOn compileTestJava
+    dependsOn processResources
+    dependsOn processTestResources
+    dependsOn test
+    dependsOn jacocoTestReport
+    dependsOn distTar
+    dependsOn distZip
+    dependsOn jar
+    dependsOn startScripts
+    inputDir = file('.')
+    images.add("airbyte/migration:$version")
+}
+build.dependsOn(buildMyAppImage)

airbyte-scheduler/app/.dockerignore

@@ -1,3 +1,4 @@
 *
+!src
 !Dockerfile
 !build

airbyte-scheduler/app/build.gradle

@@ -1,5 +1,8 @@
+import com.bmuschko.gradle.docker.tasks.image.*
+
 plugins {
     id 'application'
+    id 'com.bmuschko.docker-remote-api'
 }
 
 dependencies {
@@ -57,3 +60,23 @@ run {
     environment "TEMPORAL_HOST", "localhost:7233"
 
 }
+
+def buildTag = System.getenv('VERSION') ?: 'dev'
+// Use task types
+task buildMyAppImage(type: DockerBuildImage) {
+    dependsOn processResources
+    dependsOn processTestResources
+    dependsOn compileJava
+    dependsOn compileTestJava
+    dependsOn test
+    dependsOn jar
+    dependsOn startScripts
+    dependsOn distTar
+    dependsOn distZip
+    dependsOn jacocoTestReport
+    inputDir = file('.')
+    images.add("airbyte/scheduler:$buildTag")
+    noCache = false
+    quiet = false
+}
+assemble.dependsOn(buildMyAppImage)

airbyte-server/.dockerignore

@@ -1,3 +1,4 @@
 *
+!src
 !Dockerfile
 !build

airbyte-server/build.gradle

@@ -1,7 +1,10 @@
+import com.bmuschko.gradle.docker.tasks.image.*
+
 plugins {
     id 'application'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.0'
+    id 'com.bmuschko.docker-remote-api'
 }
 
 shadowJar {
@@ -126,3 +129,31 @@ run {
     environment "AIRBYTE_ROLE", System.getenv('AIRBYTE_ROLE')
     environment "TEMPORAL_HOST", "localhost:7233"
 }
+
+def buildTag = System.getenv('VERSION') ?: 'dev'
+// Use task types
+task buildMyAppImage(type: DockerBuildImage) {
+    dependsOn copySeed
+    dependsOn processResources
+    dependsOn processTestResources
+    dependsOn jar
+    dependsOn shadowJar
+    dependsOn compileTestJava
+    dependsOn distTar
+    dependsOn distZip
+    dependsOn shadowDistTar
+    dependsOn shadowDistZip
+    dependsOn startScripts
+    dependsOn startShadowScripts
+    dependsOn test
+    dependsOn jacocoTestReport
+    inputDir = file('.')
+    images.add("airbyte/server:$buildTag")
+}
+build.dependsOn(buildMyAppImage)
+startScripts.dependsOn(shadowJar)
+distTar.dependsOn(shadowJar)
+distZip.dependsOn(shadowJar)
+startShadowScripts.dependsOn(jar)
+shadowDistTar.dependsOn(jar)
+shadowDistZip.dependsOn(jar)

airbyte-webapp/build.gradle

@@ -1,6 +1,9 @@
+import com.bmuschko.gradle.docker.tasks.image.*
+
 plugins {
     id "base"
     id "com.github.node-gradle.node" version "3.1.1"
+    id 'com.bmuschko.docker-remote-api'
 }
 
 def nodeVersion = System.getenv('NODE_VERSION') ?: '14.11.0'
@@ -40,3 +43,14 @@ task copyDocs(type: Copy) {
 
 copyDocs.dependsOn npm_run_build
 assemble.dependsOn copyDocs
+
+// Use task types
+task buildMyAppImage(type: DockerBuildImage) {
+    dependsOn copyDocs
+    dependsOn nodeSetup
+    dependsOn npmInstall
+    dependsOn npm_run_build
+    inputDir = file('.')
+    images.add("airbyte/webapp:$version")
+}
+build.dependsOn(buildMyAppImage)

airbyte-workers/.dockerignore

@@ -0,0 +1,4 @@
+*
+!src
+!Dockerfile
+!build

airbyte-workers/build.gradle

@@ -1,9 +1,11 @@
 import org.jsonschema2pojo.SourceType
+import com.bmuschko.gradle.docker.tasks.image.*
 
 plugins {
     id 'application'
     id 'com.github.eirnym.js2p' version '1.0'
     id 'airbyte-integration-test-java'
+    id 'com.bmuschko.docker-remote-api'
 }
 
 configurations {
@@ -62,3 +64,20 @@ application {
     mainClass = mainClassName
     applicationDefaultJvmArgs = ['-XX:MaxRAMPercentage=75.0']
 }
+
+def buildTag = System.getenv('VERSION') ?: 'dev'
+// Use task types
+task buildMyAppImage(type: DockerBuildImage) {
+    dependsOn compileTestJava
+    dependsOn distTar
+    dependsOn distZip
+    dependsOn jar
+    dependsOn processTestResources
+    dependsOn startScripts
+    dependsOn compileIntegrationTestJavaJava
+    dependsOn test
+    dependsOn jacocoTestReport
+    inputDir = file('.')
+    images.add("airbyte/worker:$buildTag")
+}
+assemble.dependsOn(buildMyAppImage)

build.gradle

@@ -1,3 +1,14 @@
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath 'com.bmuschko:gradle-docker-plugin:7.1.0'
+    }
+}
+
 plugins {
     id 'base'
     id 'pmd'
@@ -58,22 +69,22 @@ def createJavaLicenseWith = { license ->
 // monorepo setup and it doesn't actually exclude directories reliably. This code makes the behavior predictable.
 def createSpotlessTarget = { pattern ->
     def excludes = [
-        '.gradle',
-        'node_modules',
-        '.eggs',
-        '.mypy_cache',
-        '.venv',
-        '*.egg-info',
-        'build',
-        'dbt-project-template',
-        'dbt-project-template-mssql',
-        'dbt-project-template-mysql',
-        'dbt-project-template-oracle',
-        'dbt_test_config',
-        'normalization_test_output',
-        'tools',
-        'secrets',
-        'charts' // Helm charts often have injected template strings that will fail general linting. Helm linting is done separately.
+            '.gradle',
+            'node_modules',
+            '.eggs',
+            '.mypy_cache',
+            '.venv',
+            '*.egg-info',
+            'build',
+            'dbt-project-template',
+            'dbt-project-template-mssql',
+            'dbt-project-template-mysql',
+            'dbt-project-template-oracle',
+            'dbt_test_config',
+            'normalization_test_output',
+            'tools',
+            'secrets',
+            'charts' // Helm charts often have injected template strings that will fail general linting. Helm linting is done separately.
     ]
 
     if (System.getenv().containsKey("SUB_BUILD")) {
@@ -125,9 +136,9 @@ allprojects {
                 ":airbyte-webapp",
         ].toSet().asImmutable()
 
-        if (project.getPath() in composeDeps) {
+        /*if (project.getPath() in composeDeps) {
             composeBuild.dependsOn(project.getPath() + ':assemble')
-        }
+        }*/
     }
 }
 
@@ -233,6 +244,7 @@ subprojects {
         testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
         testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
         testImplementation 'org.assertj:assertj-core:3.21.0'
+
     }
 
     tasks.withType(Tar) {
@@ -244,28 +256,6 @@ subprojects {
     }
 }
 
-task composeBuild {
-    def buildTag = System.getenv('VERSION') ?: 'dev'
-    def buildPlatform = System.getenv('DOCKER_BUILD_PLATFORM') ?: 'linux/amd64'
-    def buildArch = System.getenv('DOCKER_BUILD_ARCH') ?: 'amd64'
-    def jdkVersion = System.getenv('JDK_VERSION') ?: '14.0.2'
-    def dockerComposeFile = buildArch == 'arm64' ? 'docker-compose.build-m1.yaml' : 'docker-compose.build.yaml'
-    doFirst {
-        exec {
-            workingDir rootDir
-            commandLine 'docker-compose', '-f', dockerComposeFile, 'build', '--parallel', '--quiet'
-            environment 'VERSION', buildTag
-            environment 'DOCKER_BUILD_PLATFORM', buildPlatform
-            environment 'DOCKER_BUILD_ARCH', buildArch
-            environment 'JDK_VERSION', jdkVersion
-        }
-    }
-}
-
-if (!System.getenv().containsKey("SUB_BUILD") || System.getenv().get("SUB_BUILD") == "PLATFORM") {
-    build.dependsOn(composeBuild)
-}
-
 task('generate') {
     dependsOn subprojects.collect { it.getTasksByName('generateProtocolClassFiles', true) }
     dependsOn subprojects.collect { it.getTasksByName('generateJsonSchema2Pojo', true) }