You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by dz...@apache.org on 2021/09/17 08:53:34 UTC
[drill] branch 7999-docker-jdk created (now b061470)
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a change to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git.
at b061470 Make the build container base image name an ARG, BUILD_BASE_IMAGE.
This branch includes the following new commits:
new 060087e Base Docker image on maven:3.8.2-jdk-11 and openjdk-11.
new d63eb42 Add Apache license to .dockerignore.
new aeb4151 Make the OpenJDK base image name a variable.
new 1c725c7 Base the build container on OpenJDK 8 to maintain compat with JDK >= 8
new f95f8b1 Remove individual module build commands.
new aa22152 Add hooks/ dir containing hooks for Docker Hub image builder.
new 0d1c3fc Add openjdk-8 tag to drill:latest, separate version numbers with hyphen, newest = 14.
new 029cc78 Add Apache License to Docker Hub hooks in hooks/
new b061470 Make the build container base image name an ARG, BUILD_BASE_IMAGE.
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[drill] 04/09: Base the build container on OpenJDK 8 to maintain
compat with JDK >= 8
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 1c725c7b996002d13a001cc203abe9216c3172c0
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Sep 16 15:14:22 2021 +0200
Base the build container on OpenJDK 8 to maintain compat with JDK >= 8
---
Dockerfile | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6976a90..51e5423 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,15 @@
# This Dockerfile is used for automated builds in DockerHub. It adds
# project sources into the build image, builds Drill and copies built
-# binaries into the target image based on the image name in BASE_NAME
-# env var which you should set when invoking docker build.
-# Example BASE_NAME values: openjdk:8-jre, openjdk:11-jre, openjdk:latest
+# binaries into the target image based on the image name in BASE_IMAGE
+# build arg which you should set when invoking docker build.
+# Example syntax: docker build --build-arg BASE_IMAGE="openjdk:8-jre"
+
+ARG $BASE_IMAGE=openjdk:11-jre
# Uses intermediate image for building Drill to reduce target image size
-FROM maven:3.8.2-openjdk-11 as build
+# Build using OpenJDK 8 to maintain compatibility with all OpenJDK >= 8
+FROM maven:3.8.2-openjdk-8 as build
WORKDIR /src
@@ -53,7 +56,7 @@ RUN VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --n
# Target image
-# Set the BASE_IMAGE env var when you invoke docker build.
+# Set the BASE_IMAGE build arg when you invoke docker build.
FROM $BASE_IMAGE
ENV DRILL_HOME=/opt/drill
[drill] 08/09: Add Apache License to Docker Hub hooks in hooks/
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 029cc780065b8eb5a9f9725838f3bdffad796b65
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Fri Sep 17 06:10:53 2021 +0200
Add Apache License to Docker Hub hooks in hooks/
---
hooks/build | 17 +++++++++++++++++
hooks/push | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/hooks/build b/hooks/build
index 8e32bc4..c73a76b 100755
--- a/hooks/build
+++ b/hooks/build
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
docker build --build-arg BASE_IMAGE=openjdk:8-jre -t apache/drill:openjdk-8 -t apache/drill:latest .
docker build --build-arg BASE_IMAGE=openjdk:11-jre -t apache/drill:openjdk-11 .
docker build --build-arg BASE_IMAGE=openjdk:14 -t apache/drill:openjdk-14 .
diff --git a/hooks/push b/hooks/push
index 87606cc..08680dc 100755
--- a/hooks/push
+++ b/hooks/push
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
docker push apache/drill:openjdk-8
docker push apache/drill:openjdk-11
docker push apache/drill:openjdk-14
[drill] 01/09: Base Docker image on maven:3.8.2-jdk-11 and
openjdk-11.
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 060087e87c1f3e78a4b06115e8aebb2c165a102a
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Sep 2 12:05:42 2021 +0200
Base Docker image on maven:3.8.2-jdk-11 and openjdk-11.
---
.dockerignore | 8 ++++++++
Dockerfile | 16 +++++++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..4ce0e46
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+.dockerignore
+Dockerfile
+.git
+
+# The top-level Dockerfile does its own Maven build so we don't want
+# distribution/target. See distribution/Dockerfile for a Dockerfile that
+# builds an image using binaries copied from distribution/target.
+distribution/target
diff --git a/Dockerfile b/Dockerfile
index cfe3a2d..5a2f884 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,19 +16,25 @@
# limitations under the License.
#
-# This Dockerfile is used for automated builds in DockerHub. It adds project sources into the build image, builds
-# Drill and copies built binaries into the target image based on openjdk:8u232-jdk image.
+# This Dockerfile is used for automated builds in DockerHub. It adds
+# project sources into the build image, builds Drill and copies built
+# binaries into the target image based on openjdk:11 image.
# Uses intermediate image for building Drill to reduce target image size
-FROM maven:3.6.3-jdk-8 as build
+FROM maven:3.8.2-jdk-11 as build
# Copy project sources into the container
COPY . /src
WORKDIR /src
+# Fetch Drill build deps in a separate layer from the build so that they are
+# cached even if the Maven build fails. Fetch up to 4 dependencies in
+# parallel.
+RUN mvn -Dmaven.artifact.threads=4 dependency:resolve
+
# Builds Drill
-RUN mvn clean install -DskipTests -q
+RUN mvn -T1C clean install -DskipTests -q
# Get project version and copy built binaries into /opt/drill directory
RUN VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) \
@@ -36,7 +42,7 @@ RUN VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --n
&& mv distribution/target/apache-drill-${VERSION}/apache-drill-${VERSION}/* /opt/drill
# Target image
-FROM openjdk:8u232-jdk
+FROM openjdk:11
RUN mkdir /opt/drill
[drill] 09/09: Make the build container base image name an ARG,
BUILD_BASE_IMAGE.
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit b061470962755519cfdd2c5681ccf65bc30d3e69
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Fri Sep 17 10:34:31 2021 +0200
Make the build container base image name an ARG, BUILD_BASE_IMAGE.
---
Dockerfile | 25 +++++++++++++++++--------
hooks/build | 23 ++++++++++++++++++++---
2 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f2966dd..4daf6cf 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,15 +18,21 @@
# This Dockerfile is used for automated builds in DockerHub. It adds
# project sources into the build image, builds Drill and copies built
-# binaries into the target image based on the image name in BASE_IMAGE
-# build arg which you should set when invoking docker build.
-# Example syntax: docker build --build-arg BASE_IMAGE="openjdk:8-jre"
+# binaries into the target image.
-ARG $BASE_IMAGE=openjdk:8-jre
+# Example usage:
+#
+# {docker|podman} build \
+# --build-arg BUILD_BASE_IMAGE=maven:3.8.2-openjdk-11 \
+# --build-arg BASE_IMAGE=openjdk:11-jre \
+# -t apache/drill-openjdk-11
+
+# Unless otherwise specified, the intermediate container image will be
+# based on the following default.
+ARG BUILD_BASE_IMAGE=maven:3.8.2-openjdk-8
# Uses intermediate image for building Drill to reduce target image size
-# Build using OpenJDK 8 to maintain compatibility with all OpenJDK >= 8
-FROM maven:3.8.2-openjdk-8 as build
+FROM $BUILD_BASE_IMAGE as build
WORKDIR /src
@@ -43,6 +49,10 @@ RUN VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --n
# Target image
+# Unless otherwise specified, the final container image will be based on
+# the following default.
+ARG BASE_IMAGE=openjdk:8-jre
+
# Set the BASE_IMAGE build arg when you invoke docker build.
FROM $BASE_IMAGE
@@ -54,5 +64,4 @@ COPY --from=build /opt/drill $DRILL_HOME
# Starts Drill in embedded mode and connects to Sqlline
ENTRYPOINT $DRILL_HOME/bin/drill-embedded
-
-
+
diff --git a/hooks/build b/hooks/build
index c73a76b..94e61db 100755
--- a/hooks/build
+++ b/hooks/build
@@ -15,7 +15,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-docker build --build-arg BASE_IMAGE=openjdk:8-jre -t apache/drill:openjdk-8 -t apache/drill:latest .
-docker build --build-arg BASE_IMAGE=openjdk:11-jre -t apache/drill:openjdk-11 .
-docker build --build-arg BASE_IMAGE=openjdk:14 -t apache/drill:openjdk-14 .
+docker build \
+ --build-arg BUILD_BASE_IMAGE=maven:3.8.2-openjdk-8 \
+ --build-arg BASE_IMAGE=openjdk:8-jre \
+ -t apache/drill:openjdk-8 \
+ -t apache/drill:latest \
+ .
+docker build \
+ --build-arg BUILD_BASE_IMAGE=maven:3.8.2-openjdk-11 \
+ --build-arg BASE_IMAGE=openjdk:11-jre \
+ -t apache/drill:openjdk-11 \
+ .
+
+# Maven images in Docker Hub jump from OpenJDK 11 to OpenJDK 16 so we build
+# with OpenJDK 11 for the OpenJDK 14-based container.
+
+docker build \
+ --build-arg BUILD_BASE_IMAGE=maven:3.8.2-openjdk-11 \
+ --build-arg BASE_IMAGE=openjdk:14 \
+ -t apache/drill:openjdk-14 \
+ .
[drill] 06/09: Add hooks/ dir containing hooks for Docker Hub image
builder.
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit aa2215275ce5aba40b2b95dabd10aaeabb9f0fb5
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Sep 16 19:06:27 2021 +0200
Add hooks/ dir containing hooks for Docker Hub image builder.
See the committed README for more information.
---
Dockerfile | 2 +-
hooks/README | 9 +++++++++
hooks/build | 4 ++++
hooks/push | 4 ++++
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 6cf8c48..f2966dd 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@
# build arg which you should set when invoking docker build.
# Example syntax: docker build --build-arg BASE_IMAGE="openjdk:8-jre"
-ARG $BASE_IMAGE=openjdk:11-jre
+ARG $BASE_IMAGE=openjdk:8-jre
# Uses intermediate image for building Drill to reduce target image size
# Build using OpenJDK 8 to maintain compatibility with all OpenJDK >= 8
diff --git a/hooks/README b/hooks/README
new file mode 100644
index 0000000..53f7b03
--- /dev/null
+++ b/hooks/README
@@ -0,0 +1,9 @@
+This directory exists for Docker Hub's automatic image building. The hooks
+here override the default build, test and push commands used by Docker Hub
+to build the published Docker images of Drill. The reason they are overridden
+is so that we can produce Docker images based on multiple OpenJDK base images,
+all using a single Dockerfile. Also see
+
+../Dockerfile
+https://docs.docker.com/docker-hub/builds/advanced/
+
diff --git a/hooks/build b/hooks/build
new file mode 100755
index 0000000..6e08a9d
--- /dev/null
+++ b/hooks/build
@@ -0,0 +1,4 @@
+docker build --build-arg BASE_IMAGE=openjdk:8-jre -t apache/drill:latest .
+docker build --build-arg BASE_IMAGE=openjdk:11-jre -t apache/drill:openjdk11 .
+docker build --build-arg BASE_IMAGE=openjdk:17 -t apache/drill:openjdk17 .
+
diff --git a/hooks/push b/hooks/push
new file mode 100755
index 0000000..31b32e3
--- /dev/null
+++ b/hooks/push
@@ -0,0 +1,4 @@
+docker push apache/drill:latest
+docker push apache/drill:openjdk11
+docker push apache/drill:openjdk17
+
[drill] 03/09: Make the OpenJDK base image name a variable.
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit aeb41514c1bfc344a8ef774c227bae4e63f422e4
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Sep 16 14:28:40 2021 +0200
Make the OpenJDK base image name a variable.
This allows using a single Dockerfile to target a variety of OpenJDK versions.
---
.dockerignore | 5 +++--
Dockerfile | 44 ++++++++++++++++++++++++++++++--------------
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index c54d602..aabd129 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,9 +18,10 @@
.dockerignore
Dockerfile
.git
+**/.project
# The top-level Dockerfile does its own Maven build so we don't want
-# distribution/target. See distribution/Dockerfile for a Dockerfile that
+# **/target. See distribution/Dockerfile for a Dockerfile that
# builds an image using binaries copied from distribution/target.
-distribution/target
+**/target
diff --git a/Dockerfile b/Dockerfile
index 5a2f884..6976a90 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,23 +18,33 @@
# This Dockerfile is used for automated builds in DockerHub. It adds
# project sources into the build image, builds Drill and copies built
-# binaries into the target image based on openjdk:11 image.
+# binaries into the target image based on the image name in BASE_NAME
+# env var which you should set when invoking docker build.
+# Example BASE_NAME values: openjdk:8-jre, openjdk:11-jre, openjdk:latest
# Uses intermediate image for building Drill to reduce target image size
-FROM maven:3.8.2-jdk-11 as build
-
-# Copy project sources into the container
-COPY . /src
+FROM maven:3.8.2-openjdk-11 as build
WORKDIR /src
-# Fetch Drill build deps in a separate layer from the build so that they are
-# cached even if the Maven build fails. Fetch up to 4 dependencies in
-# parallel.
-RUN mvn -Dmaven.artifact.threads=4 dependency:resolve
+# Copy project sources into the container
+COPY . .
+
+# Optimisation: build a selection of Drill modules in advance.
+# It isn't necessary to build any modules independently but doing so divides
+# the downloading and compiling up over multiple cacheable layers, better
+# enabling reuse in the event of an isolated change and resume in the event
+# of a build error. This paragraph can safely be commented out.
+RUN mvn -am -pl tools -Dmaven.artifact.threads=5 -T1C install -DskipTests
+RUN mvn -am -pl protocol -Dmaven.artifact.threads=5 -T1C install -DskipTests
+RUN mvn -am -pl common -Dmaven.artifact.threads=5 -T1C install -DskipTests
+RUN mvn -am -pl logical -Dmaven.artifact.threads=5 -T1C install -DskipTests
+RUN mvn -am -pl exec -Dmaven.artifact.threads=5 -T1C install -DskipTests
+RUN mvn -am -pl drill-yarn -Dmaven.artifact.threads=5 -T1C install -DskipTests
+RUN mvn -am -pl distribution -Dmaven.artifact.threads=5 -T1C install -DskipTests
# Builds Drill
-RUN mvn -T1C clean install -DskipTests -q
+RUN mvn -Dmaven.artifact.threads=5 -T1C install -DskipTests
# Get project version and copy built binaries into /opt/drill directory
RUN VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) \
@@ -42,11 +52,17 @@ RUN VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --n
&& mv distribution/target/apache-drill-${VERSION}/apache-drill-${VERSION}/* /opt/drill
# Target image
-FROM openjdk:11
-RUN mkdir /opt/drill
+# Set the BASE_IMAGE env var when you invoke docker build.
+FROM $BASE_IMAGE
+
+ENV DRILL_HOME=/opt/drill
+
+RUN mkdir $DRILL_HOME
-COPY --from=build /opt/drill /opt/drill
+COPY --from=build /opt/drill $DRILL_HOME
# Starts Drill in embedded mode and connects to Sqlline
-ENTRYPOINT /opt/drill/bin/drill-embedded
+ENTRYPOINT $DRILL_HOME/bin/drill-embedded
+
+
[drill] 05/09: Remove individual module build commands.
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit f95f8b199b072212cb408e2feffa62bb3cbdcdae
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Sep 16 15:36:58 2021 +0200
Remove individual module build commands.
I had hoped these module build layers would be an optimisation but
I now think they result in Maven doing rework rather than building
incrementally.
---
Dockerfile | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 51e5423..6cf8c48 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,19 +33,6 @@ WORKDIR /src
# Copy project sources into the container
COPY . .
-# Optimisation: build a selection of Drill modules in advance.
-# It isn't necessary to build any modules independently but doing so divides
-# the downloading and compiling up over multiple cacheable layers, better
-# enabling reuse in the event of an isolated change and resume in the event
-# of a build error. This paragraph can safely be commented out.
-RUN mvn -am -pl tools -Dmaven.artifact.threads=5 -T1C install -DskipTests
-RUN mvn -am -pl protocol -Dmaven.artifact.threads=5 -T1C install -DskipTests
-RUN mvn -am -pl common -Dmaven.artifact.threads=5 -T1C install -DskipTests
-RUN mvn -am -pl logical -Dmaven.artifact.threads=5 -T1C install -DskipTests
-RUN mvn -am -pl exec -Dmaven.artifact.threads=5 -T1C install -DskipTests
-RUN mvn -am -pl drill-yarn -Dmaven.artifact.threads=5 -T1C install -DskipTests
-RUN mvn -am -pl distribution -Dmaven.artifact.threads=5 -T1C install -DskipTests
-
# Builds Drill
RUN mvn -Dmaven.artifact.threads=5 -T1C install -DskipTests
[drill] 02/09: Add Apache license to .dockerignore.
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit d63eb426388df638c3437385dd654150b5a1aaa8
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Wed Sep 15 12:38:50 2021 +0200
Add Apache license to .dockerignore.
---
.dockerignore | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/.dockerignore b/.dockerignore
index 4ce0e46..c54d602 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
.dockerignore
Dockerfile
.git
@@ -5,4 +22,5 @@ Dockerfile
# The top-level Dockerfile does its own Maven build so we don't want
# distribution/target. See distribution/Dockerfile for a Dockerfile that
# builds an image using binaries copied from distribution/target.
+
distribution/target
[drill] 07/09: Add openjdk-8 tag to drill:latest,
separate version numbers with hyphen, newest = 14.
Posted by dz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 7999-docker-jdk
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 0d1c3fc1f6846d793d33c017c782f64b70ac5f72
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Sep 16 19:24:20 2021 +0200
Add openjdk-8 tag to drill:latest, separate version numbers with hyphen, newest = 14.
---
hooks/build | 6 +++---
hooks/push | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hooks/build b/hooks/build
index 6e08a9d..8e32bc4 100755
--- a/hooks/build
+++ b/hooks/build
@@ -1,4 +1,4 @@
-docker build --build-arg BASE_IMAGE=openjdk:8-jre -t apache/drill:latest .
-docker build --build-arg BASE_IMAGE=openjdk:11-jre -t apache/drill:openjdk11 .
-docker build --build-arg BASE_IMAGE=openjdk:17 -t apache/drill:openjdk17 .
+docker build --build-arg BASE_IMAGE=openjdk:8-jre -t apache/drill:openjdk-8 -t apache/drill:latest .
+docker build --build-arg BASE_IMAGE=openjdk:11-jre -t apache/drill:openjdk-11 .
+docker build --build-arg BASE_IMAGE=openjdk:14 -t apache/drill:openjdk-14 .
diff --git a/hooks/push b/hooks/push
index 31b32e3..87606cc 100755
--- a/hooks/push
+++ b/hooks/push
@@ -1,4 +1,4 @@
-docker push apache/drill:latest
-docker push apache/drill:openjdk11
-docker push apache/drill:openjdk17
+docker push apache/drill:openjdk-8
+docker push apache/drill:openjdk-11
+docker push apache/drill:openjdk-14