Use protoc-base image (#1686)

deephaven · Dec 13, 2021 · eb8e23f · eb8e23f
1 parent 6e3f731
commit eb8e23f
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 97 deletions.
diff --git a/build.gradle b/build.gradle
@@ -92,12 +92,17 @@ idea {
 ext.versionSource = versionSource
 ext.globalVersion = "0.7.0"
 
-// To set fishlibVersion, go to project-local gradle.properties file
-// (or, use the gradle.properties in $USER_HOME/.gradle for a global override)
-// If you have fishlib open in IDE, also set includeFish=true to get the
-// intellij projects wired up across repositories.
-
-Set<Project> modsAreBasic = subprojects.findAll {it.name in ['deephaven-wheel', 'deephaven2-wheel', 'envoy', 'grpc-proxy', 'web-client-ui', 'protoc', 'pyclient', 'sphinx', 'docker-java-and-python', 'docker-runtime-base'] }
+Set<Project> modsAreBasic = subprojects.findAll {it.name in [
+ 'deephaven-wheel',
+ 'deephaven2-wheel',
+ 'envoy',
+ 'grpc-proxy',
+ 'web-client-ui',
+ 'pyclient',
+ 'sphinx',
+ 'docker-java-and-python',
+ 'docker-runtime-base',
+] }
 
 Set<Project> modsAreBin = subprojects.findAll {it.name in ['bin', 'configs', 'test-configs'] }
 

diff --git a/docker/registry/protoc-base/gradle.properties b/docker/registry/protoc-base/gradle.properties
@@ -0,0 +1,2 @@
+deephaven.registry.imageName=ghcr.io/deephaven/protoc-base:latest
+deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:25fabb9111d876a14cef357d1e5d78ead942e2dd0c587aa0efff817128516ee8
diff --git a/proto/build.gradle b/proto/build.gradle
@@ -1,5 +1,7 @@
 // keep this in sync w/ shadowed/proto/shadow-proto.gradle
 def grpcVersion = '1.38.0'
+
+// TODO(deephaven-core#1685): Create strategy around updating and maintaining protoc version
 def protobufVersion = '3.17.3'
 def protocVersion = protobufVersion
 def boringSslVersion = '2.0.34.Final'

diff --git a/proto/proto-backplane-grpc/Dockerfile b/proto/proto-backplane-grpc/Dockerfile
@@ -1,4 +1,4 @@
-FROM deephaven/protoc:local-build
+FROM deephaven/protoc-base:local-build
 
 COPY src/main/proto /includes
 

diff --git a/proto/proto-backplane-grpc/build.gradle b/proto/proto-backplane-grpc/build.gradle
@@ -2,7 +2,7 @@ plugins {
  id 'com.bmuschko.docker-remote-api'
 }
 
-evaluationDependsOn ':protoc'
+evaluationDependsOn Docker.registryProject('protoc-base')
 
 description = 'The Deephaven proto-backplane-grpc'
 
@@ -33,7 +33,7 @@ TaskProvider<Task> generateProtobuf = Docker.registerDockerTask(project, 'genera
  }
  }
  }
- parentContainers = [ project(':protoc').tasks.findByName('buildDocker') ]
+ parentContainers = [ Docker.registryTask(project, 'protoc-base') ]
  containerOutPath = '/generated'
  imageName = 'deephaven/proto-backplane-grpc:local-build'
  copyOut {

diff --git a/protoc/.dockerignore b/protoc/.dockerignore
diff --git a/protoc/Dockerfile b/protoc/Dockerfile
diff --git a/protoc/build.gradle b/protoc/build.gradle
diff --git a/protoc/checksums.txt b/protoc/checksums.txt
diff --git a/protoc/package-lock.json b/protoc/package-lock.json
diff --git a/protoc/package.json b/protoc/package.json
diff --git a/settings.gradle b/settings.gradle
@@ -57,7 +57,6 @@ include 'DHProcess'
 include 'proto:proto-backplane-grpc'
 include 'proto:proto-backplane-grpc-flight'
 include 'proto:raw-js-openapi'
-include 'protoc'
 
 // logger
 include 'log-factory'