Skip to content

Commit 4c5e02d

Browse files
authored
Merge pull request #592 from boozallen/589-use-rhat-ubi-image-for-hive-service
#589 update the aissemble-hive-service base image to use RHAT UBI
2 parents 989bbd1 + 4c8ce0f commit 4c5e02d

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

DRAFT_RELEASE_NOTES.md

+4
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ To start your aiSSEMBLE upgrade, update your project's pom.xml to use the 1.11.0
8080

8181
## Conditional Steps
8282

83+
### For projects that have customized the Hive service
84+
The hive service base image has been switched from `docker.io/eclipse-temurin:17-jre` to `registry.access.redhat.com/ubi9/openjdk-17-runtime:1.21`.
85+
Projects should update their Hive service Dockerfile or any related startup configuration script to use `microdnf` instead `apt-get` as the package manager if applicable
86+
8387
## Final Steps - Required for All Projects
8488
### Finalizing the Upgrade
8589
1. Run `./mvnw org.technologybrewery.baton:baton-maven-plugin:baton-migrate` to apply the automatic migrations

extensions/extensions-docker/aissemble-hive-service/src/main/resources/docker/Dockerfile

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG METASTORE_VERSION
2-
FROM docker.io/eclipse-temurin:17-jre AS builder
2+
FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.21 as builder
33

44
ARG METASTORE_VERSION
55
ARG HADOOP_VERSION
@@ -11,9 +11,14 @@ ENV HADOOP_HOME=/opt/hadoop
1111
ENV HIVE_HOME=/opt/hive
1212
ENV HIVE_VER=$METASTORE_VERSION
1313

14+
USER root
15+
16+
RUN set -eux; \
17+
microdnf install -y gzip util-linux
18+
1419
# Install hadoop
1520
RUN cd /tmp \
16-
&& wget https://archive.apache.org/dist/hadoop/common/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}.tar.gz -O - \
21+
&& curl https://archive.apache.org/dist/hadoop/common/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}.tar.gz \
1722
| tar -xzf - \
1823
&& mv hadoop-${HADOOP_VERSION} $HADOOP_HOME
1924

@@ -41,7 +46,7 @@ RUN sed -i \
4146
's/org.apache.hadoop.hive.metastore.tools.MetastoreSchemaTool/org.apache.hadoop.hive.metastore.tools.schematool.MetastoreSchemaTool/' \
4247
"$HIVE_HOME/bin/ext/schemaTool.sh"
4348

44-
FROM docker.io/eclipse-temurin:17-jre AS final
49+
FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.21 as final
4550

4651
LABEL org.opencontainers.image.source="https://github.com/boozallen/aissemble"
4752

@@ -62,6 +67,8 @@ COPY --from=builder $HIVE_HOME $HIVE_HOME
6267

6368
COPY --chmod=755 src/main/resources/scripts/entrypoint.sh /entrypoint.sh
6469

70+
USER root
71+
6572
RUN groupadd -rf hive --gid=1000 && \
6673
useradd --home $HIVE_HOME -g hive --shell /usr/sbin/nologin --uid 1000 hive -o && \
6774
chown hive:hive -R $HIVE_HOME

foundation/foundation-mda/src/main/java/com/boozallen/aiops/mda/generator/S3LocalValuesKubernetesGenerator.java

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.boozallen.aiops.mda.generator.common.VelocityProperty;
1515
import com.boozallen.aiops.mda.metamodel.AissembleModelInstanceRepository;
1616
import com.boozallen.aiops.mda.metamodel.element.Pipeline;
17-
import com.boozallen.aiops.mda.metamodel.element.python.MachineLearningPipeline;
1817
import org.apache.velocity.VelocityContext;
1918
import org.technologybrewery.fermenter.mda.generator.GenerationContext;
2019

0 commit comments

Comments
 (0)