Skip to content

Commit bbc20f3

Browse files
authored
HBASE-27608 Use lowercase image reference name in our docker file (#5005)
Signed-off-by: Bryan Beaudreault <bbeaudreault@apache.org>
1 parent 55b4bbc commit bbc20f3

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

dev-support/docker/Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# tweaking unrelated aspects of the image.
2222

2323
# start with a minimal image into which we can download remote tarballs
24-
FROM ubuntu:22.04 AS BASE_IMAGE
24+
FROM ubuntu:22.04 AS base_image
2525
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2626

2727
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
@@ -72,38 +72,38 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
7272
# download sundry dependencies
7373
#
7474

75-
FROM BASE_IMAGE AS SPOTBUGS_DOWNLOAD_IMAGE
75+
FROM base_image AS spotbugs_download_image
7676
ENV SPOTBUGS_VERSION '4.7.3'
7777
ENV SPOTBUGS_URL "https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/${SPOTBUGS_VERSION}/spotbugs-${SPOTBUGS_VERSION}.tgz"
7878
ENV SPOTBUGS_SHA512 '09a9fe0e5a6ec8e9d6d116c361b5c34c9d0560c0271241f02fadee911952adfcd69dc184f6de1cc4d4a8fe2c84c162689ea9a691dcae0779935eedf390fcc4ad'
7979
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
8080
RUN curl --location --fail --silent --show-error --output /tmp/spotbugs.tgz "${SPOTBUGS_URL}" && \
8181
echo "${SPOTBUGS_SHA512} */tmp/spotbugs.tgz" | sha512sum -c -
8282

83-
FROM BASE_IMAGE AS HADOLINT_DOWNLOAD_IMAGE
83+
FROM base_image AS hadolint_download_image
8484
ENV HADOLINT_VERSION '2.10.0'
8585
ENV HADOLINT_URL "https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-Linux-x86_64"
8686
ENV HADOLINT_SHA512 '4816c95243bedf15476d2225f487fc17465495fb2031e1a4797d82a26db83a1edb63e4fed084b80cef17d5eb67eb45508caadaf7cd0252fb061187113991a338'
8787
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
8888
RUN curl --location --fail --silent --show-error --output /tmp/hadolint "${HADOLINT_URL}" && \
8989
echo "${HADOLINT_SHA512} */tmp/hadolint" | sha512sum -c -
9090

91-
FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE
91+
FROM base_image AS maven_download_image
9292
ENV MAVEN_VERSION='3.8.6'
9393
ENV MAVEN_URL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
9494
ENV MAVEN_SHA512 'f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26'
9595
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9696
RUN curl --location --fail --silent --show-error --output /tmp/maven.tar.gz "${MAVEN_URL}" && \
9797
echo "${MAVEN_SHA512} */tmp/maven.tar.gz" | sha512sum -c -
9898

99-
FROM BASE_IMAGE AS OPENJDK8_DOWNLOAD_IMAGE
99+
FROM base_image AS openjdk8_download_image
100100
ENV OPENJDK8_URL 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz'
101101
ENV OPENJDK8_SHA256 '1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee'
102102
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
103103
RUN curl --location --fail --silent --show-error --output /tmp/adoptopenjdk8.tar.gz "${OPENJDK8_URL}" && \
104104
echo "${OPENJDK8_SHA256} */tmp/adoptopenjdk8.tar.gz" | sha256sum -c -
105105

106-
FROM BASE_IMAGE AS OPENJDK11_DOWNLOAD_IMAGE
106+
FROM base_image AS openjdk11_download_image
107107
ENV OPENJDK11_URL 'https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz'
108108
ENV OPENJDK11_SHA256 'b8d46ed08ef4859476fe6421a7690d899ed83dce63f13fd894f994043177ef3c'
109109
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -114,22 +114,22 @@ RUN curl --location --fail --silent --show-error --output /tmp/adoptopenjdk11.ta
114114
# build the final image
115115
#
116116

117-
FROM BASE_IMAGE
117+
FROM base_image
118118
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
119119

120120
# hadolint ignore=DL3010
121-
COPY --from=SPOTBUGS_DOWNLOAD_IMAGE /tmp/spotbugs.tgz /tmp/spotbugs.tgz
121+
COPY --from=spotbugs_download_image /tmp/spotbugs.tgz /tmp/spotbugs.tgz
122122
RUN tar xzf /tmp/spotbugs.tgz -C /opt && \
123123
ln -s "/opt/$(tar -tf /tmp/spotbugs.tgz | head -n1 | cut -d/ -f1)" /opt/spotbugs && \
124124
chmod -R a+x /opt/spotbugs/bin/* && \
125125
rm /tmp/spotbugs.tgz
126126

127-
COPY --from=HADOLINT_DOWNLOAD_IMAGE /tmp/hadolint /tmp/hadolint
127+
COPY --from=hadolint_download_image /tmp/hadolint /tmp/hadolint
128128
RUN mv /tmp/hadolint /usr/local/bin && \
129129
chmod a+x /usr/local/bin/hadolint
130130

131131
# hadolint ignore=DL3010
132-
COPY --from=MAVEN_DOWNLOAD_IMAGE /tmp/maven.tar.gz /tmp/maven.tar.gz
132+
COPY --from=maven_download_image /tmp/maven.tar.gz /tmp/maven.tar.gz
133133
RUN tar xzf /tmp/maven.tar.gz -C /opt && \
134134
ln -s "/opt/$(dirname "$(tar -tf /tmp/maven.tar.gz | head -n1)")" /opt/maven && \
135135
rm /tmp/maven.tar.gz
@@ -143,15 +143,15 @@ RUN tar xzf /tmp/maven.tar.gz -C /opt && \
143143
#
144144

145145
# hadolint ignore=DL3010
146-
COPY --from=OPENJDK8_DOWNLOAD_IMAGE /tmp/adoptopenjdk8.tar.gz /tmp/adoptopenjdk8.tar.gz
146+
COPY --from=openjdk8_download_image /tmp/adoptopenjdk8.tar.gz /tmp/adoptopenjdk8.tar.gz
147147
RUN mkdir -p /usr/lib/jvm && \
148148
tar xzf /tmp/adoptopenjdk8.tar.gz -C /usr/lib/jvm && \
149149
ln -s "/usr/lib/jvm/$(basename "$(tar -tf /tmp/adoptopenjdk8.tar.gz | head -n1)")" /usr/lib/jvm/java-8-adoptopenjdk && \
150150
ln -s /usr/lib/jvm/java-8-adoptopenjdk /usr/lib/jvm/java-8 && \
151151
rm /tmp/adoptopenjdk8.tar.gz
152152

153153
# hadolint ignore=DL3010
154-
COPY --from=OPENJDK11_DOWNLOAD_IMAGE /tmp/adoptopenjdk11.tar.gz /tmp/adoptopenjdk11.tar.gz
154+
COPY --from=openjdk11_download_image /tmp/adoptopenjdk11.tar.gz /tmp/adoptopenjdk11.tar.gz
155155
RUN mkdir -p /usr/lib/jvm && \
156156
tar xzf /tmp/adoptopenjdk11.tar.gz -C /usr/lib/jvm && \
157157
ln -s "/usr/lib/jvm/$(basename "$(tar -tf /tmp/adoptopenjdk11.tar.gz | head -n1)")" /usr/lib/jvm/java-11-adoptopenjdk && \

dev-support/hbase_docker/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
FROM ubuntu:22.04 AS BASE_IMAGE
17+
FROM ubuntu:22.04 AS base_image
1818
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1919

2020
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
@@ -30,22 +30,22 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
3030
locale-gen en_US.UTF-8
3131
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
3232

33-
FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE
33+
FROM base_image AS maven_download_image
3434
ENV MAVEN_VERSION='3.8.6'
3535
ENV MAVEN_URL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
3636
ENV MAVEN_SHA512 'f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26'
3737
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3838
RUN curl --location --fail --silent --show-error --output /tmp/maven.tar.gz "${MAVEN_URL}" && \
3939
echo "${MAVEN_SHA512} */tmp/maven.tar.gz" | sha512sum -c -
4040

41-
FROM BASE_IMAGE AS OPENJDK8_DOWNLOAD_IMAGE
41+
FROM base_image AS openjdk8_download_image
4242
ENV OPENJDK8_URL 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz'
4343
ENV OPENJDK8_SHA256 '1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee'
4444
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4545
RUN curl --location --fail --silent --show-error --output /tmp/adoptopenjdk8.tar.gz "${OPENJDK8_URL}" && \
4646
echo "${OPENJDK8_SHA256} */tmp/adoptopenjdk8.tar.gz" | sha256sum -c -
4747

48-
FROM BASE_IMAGE
48+
FROM base_image
4949
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
5050

5151
#
@@ -54,13 +54,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
5454
#
5555

5656
# hadolint ignore=DL3010
57-
COPY --from=MAVEN_DOWNLOAD_IMAGE /tmp/maven.tar.gz /tmp/maven.tar.gz
57+
COPY --from=maven_download_image /tmp/maven.tar.gz /tmp/maven.tar.gz
5858
RUN tar xzf /tmp/maven.tar.gz -C /opt && \
5959
ln -s "/opt/$(dirname "$(tar -tf /tmp/maven.tar.gz | head -n1)")" /opt/maven && \
6060
rm /tmp/maven.tar.gz
6161

6262
# hadolint ignore=DL3010
63-
COPY --from=OPENJDK8_DOWNLOAD_IMAGE /tmp/adoptopenjdk8.tar.gz /tmp/adoptopenjdk8.tar.gz
63+
COPY --from=openjdk8_download_image /tmp/adoptopenjdk8.tar.gz /tmp/adoptopenjdk8.tar.gz
6464
RUN mkdir -p /usr/lib/jvm && \
6565
tar xzf /tmp/adoptopenjdk8.tar.gz -C /usr/lib/jvm && \
6666
ln -s "/usr/lib/jvm/$(basename "$(tar -tf /tmp/adoptopenjdk8.tar.gz | head -n1)")" /usr/lib/jvm/java-8-adoptopenjdk && \

0 commit comments

Comments
 (0)