This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new 5ead07bf3 ATLAS-4944: Update ENV, VOLUME instructions to use the
recommended format
5ead07bf3 is described below
commit 5ead07bf30d7643c3b04198844c34de83175de76
Author: Abhishek Kumar <a...@apache.org>
AuthorDate: Fri Dec 13 17:15:09 2024 -0800
ATLAS-4944: Update ENV, VOLUME instructions to use the recommended format
Signed-off-by: Madhan Neethiraj <mad...@apache.org>
---
dev-support/atlas-docker/Dockerfile | 14 +++++++-------
dev-support/atlas-docker/Dockerfile.atlas | 2 +-
dev-support/atlas-docker/Dockerfile.atlas-base | 11 +++++------
dev-support/atlas-docker/Dockerfile.atlas-build | 13 ++++---------
dev-support/atlas-docker/Dockerfile.atlas-db | 2 +-
dev-support/atlas-docker/Dockerfile.atlas-hadoop | 15 +++++++--------
dev-support/atlas-docker/Dockerfile.atlas-hbase | 4 ++--
dev-support/atlas-docker/Dockerfile.atlas-hive | 7 +++----
dev-support/atlas-docker/Dockerfile.atlas-kafka | 7 +++----
dev-support/atlas-docker/Dockerfile.atlas-solr | 2 ++
10 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/dev-support/atlas-docker/Dockerfile
b/dev-support/atlas-docker/Dockerfile
index 12c1b6ea2..cfff6e28c 100644
--- a/dev-support/atlas-docker/Dockerfile
+++ b/dev-support/atlas-docker/Dockerfile
@@ -24,15 +24,15 @@ RUN apt-get update && apt-get install -y git python
# Install Java.
RUN apt-get update && apt-get install -y openjdk-8-jdk
-ENV JAVA_HOME
/usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
+ENV
JAVA_HOME=/usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
# Install Maven.
RUN apt-get update && apt-get install -y maven
-ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_HOME=/usr/share/maven
# Add Java and Maven to the path.
-ENV PATH
/usr/java/bin:/usr/local/apache-maven/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV
PATH=/usr/java/bin:/usr/local/apache-maven/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Working directory
WORKDIR /root
@@ -45,7 +45,7 @@ RUN echo 'package-lock=false' >> ./atlas/.npmrc
RUN echo 'package-lock.json' >> ./atlas/.gitignore
# Memory requirements
-ENV MAVEN_OPTS "-Xms2g -Xmx2g"
+ENV MAVEN_OPTS="-Xms2g -Xmx2g"
# RUN export MAVEN_OPTS="-Xms2g -Xmx2g"
# Remove -DskipTests if unit tests are to be included
@@ -54,9 +54,9 @@ RUN mkdir -p atlas-bin
RUN tar xzf /root/atlas/distro/target/*bin.tar.gz --strip-components 1 -C
/root/atlas-bin
# Set env variables, add it to the path, and start Atlas.
-ENV MANAGE_LOCAL_SOLR true
-ENV MANAGE_LOCAL_HBASE true
-ENV PATH
/root/atlas-bin/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV MANAGE_LOCAL_SOLR=true
+ENV MANAGE_LOCAL_HBASE=true
+ENV
PATH=/root/atlas-bin/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
EXPOSE 21000
diff --git a/dev-support/atlas-docker/Dockerfile.atlas
b/dev-support/atlas-docker/Dockerfile.atlas
index 83550c5f1..95a34168b 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas
+++ b/dev-support/atlas-docker/Dockerfile.atlas
@@ -20,7 +20,7 @@ ARG ATLAS_SERVER_JAVA_VERSION
ARG ATLAS_VERSION
ARG TARGETARCH
-ENV JAVA_HOME
/usr/lib/jvm/java-${ATLAS_SERVER_JAVA_VERSION}-openjdk-${TARGETARCH}
+ENV
JAVA_HOME=/usr/lib/jvm/java-${ATLAS_SERVER_JAVA_VERSION}-openjdk-${TARGETARCH}
RUN update-java-alternatives --set
/usr/lib/jvm/java-1.${ATLAS_SERVER_JAVA_VERSION}.0-openjdk-${TARGETARCH}
COPY ./scripts/atlas.sh ${ATLAS_SCRIPTS}/
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base
b/dev-support/atlas-docker/Dockerfile.atlas-base
index 6a39586b7..ef762d19f 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-base
+++ b/dev-support/atlas-docker/Dockerfile.atlas-base
@@ -26,15 +26,14 @@ RUN apt-get update && \
python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc
iputils-ping ssh pdsh
# Set environment variables
-ENV JAVA_HOME
/usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
-ENV ATLAS_DIST /home/atlas/dist
-ENV ATLAS_HOME /opt/atlas
-ENV ATLAS_SCRIPTS /home/atlas/scripts
-ENV PATH
/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV
JAVA_HOME=/usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
+ENV ATLAS_DIST=/home/atlas/dist
+ENV ATLAS_HOME=/opt/atlas
+ENV ATLAS_SCRIPTS=/home/atlas/scripts
+ENV
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
RUN update-java-alternatives --set
/usr/lib/jvm/java-1.${ATLAS_BASE_JAVA_VERSION}.0-openjdk-${TARGETARCH}
-
# setup groups, users, directories
RUN groupadd atlas && \
useradd -g atlas -ms /bin/bash atlas && \
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-build
b/dev-support/atlas-docker/Dockerfile.atlas-build
index 42a2536ee..7cc4a612d 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-build
+++ b/dev-support/atlas-docker/Dockerfile.atlas-build
@@ -19,14 +19,13 @@ FROM atlas-base:latest
ARG ATLAS_BUILD_JAVA_VERSION
ARG TARGETARCH
-
# Install necessary packages to build Atlas
RUN apt-get update && apt-get -y install git maven
# Set environment variables
-ENV JAVA_HOME
/usr/lib/jvm/java-${ATLAS_BUILD_JAVA_VERSION}-openjdk-${TARGETARCH}
-ENV MAVEN_HOME /usr/share/maven
-ENV PATH
/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/apache-maven/bin
+ENV
JAVA_HOME=/usr/lib/jvm/java-${ATLAS_BUILD_JAVA_VERSION}-openjdk-${TARGETARCH}
+ENV MAVEN_HOME=/usr/share/maven
+ENV
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/apache-maven/bin
RUN update-java-alternatives --set
/usr/lib/jvm/java-1.${ATLAS_BUILD_JAVA_VERSION}.0-openjdk-${TARGETARCH}
@@ -37,11 +36,7 @@ RUN mkdir -p /home/atlas/git && \
COPY ./scripts/atlas-build.sh /home/atlas/scripts/
-VOLUME /home/atlas/.m2
-VOLUME /home/atlas/scripts
-VOLUME /home/atlas/patches
-VOLUME /home/atlas/dist
-VOLUME /home/atlas/src
+VOLUME ["/home/atlas/.m2", "/home/atlas/scripts", "/home/atlas/patches",
"/home/atlas/dist", "/home/atlas/src"]
USER atlas
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-db
b/dev-support/atlas-docker/Dockerfile.atlas-db
index b596809c4..95e67675b 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-db
+++ b/dev-support/atlas-docker/Dockerfile.atlas-db
@@ -21,4 +21,4 @@ USER 0
RUN mkdir -p /docker-entrypoint-initdb.d
COPY config/init_postgres.sh /docker-entrypoint-initdb.d/
RUN chown -R postgres:postgres /docker-entrypoint-initdb.d/
-ENV POSTGRES_PASSWORD atlasR0cks!
+ENV POSTGRES_PASSWORD=atlasR0cks!
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-hadoop
b/dev-support/atlas-docker/Dockerfile.atlas-hadoop
index 26e766e7c..783a8c038 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-hadoop
+++ b/dev-support/atlas-docker/Dockerfile.atlas-hadoop
@@ -18,7 +18,6 @@ FROM atlas-base:latest
ARG HADOOP_VERSION
-
COPY ./downloads/hadoop-${HADOOP_VERSION}.tar.gz /home/atlas/dist/
COPY ./scripts/atlas-hadoop-setup.sh /home/atlas/scripts/
@@ -29,13 +28,13 @@ RUN tar xvfz
/home/atlas/dist/hadoop-${HADOOP_VERSION}.tar.gz --directory=/opt/
ln -s /opt/hadoop-${HADOOP_VERSION} /opt/hadoop && \
rm -f /home/atlas/dist/hadoop-${HADOOP_VERSION}.tar.gz
-ENV HADOOP_HOME /opt/hadoop
-ENV HADOOP_CONF_DIR /opt/hadoop/etc/hadoop
-ENV HADOOP_HDFS_HOME /opt/hadoop
-ENV HADOOP_MAPRED_HOME /opt/hadoop
-ENV HADOOP_COMMON_HOME /opt/hadoop
-ENV YARN_HOME /opt/hadoop
-ENV PATH
/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hadoop/bin
+ENV HADOOP_HOME=/opt/hadoop
+ENV HADOOP_CONF_DIR=/opt/hadoop/etc/hadoop
+ENV HADOOP_HDFS_HOME=/opt/hadoop
+ENV HADOOP_MAPRED_HOME=/opt/hadoop
+ENV HADOOP_COMMON_HOME=/opt/hadoop
+ENV YARN_HOME=/opt/hadoop
+ENV
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hadoop/bin
EXPOSE 9000
EXPOSE 8088
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-hbase
b/dev-support/atlas-docker/Dockerfile.atlas-hbase
index 6b4b6edd9..a05bda3a1 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-hbase
+++ b/dev-support/atlas-docker/Dockerfile.atlas-hbase
@@ -40,8 +40,8 @@ RUN tar xvfz
/home/atlas/dist/hbase-${HBASE_VERSION}-bin.tar.gz --directory=/opt
cp /home/atlas/scripts/hbase-site.xml /opt/hbase/conf/hbase-site.xml && \
cp -f /home/atlas/scripts/atlas-hbase-application.properties
/opt/hbase/conf/atlas-application.properties
-ENV HBASE_HOME /opt/hbase
-ENV PATH
/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hbase/bin
+ENV HBASE_HOME=/opt/hbase
+ENV
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hbase/bin
EXPOSE 16000
EXPOSE 16010
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-hive
b/dev-support/atlas-docker/Dockerfile.atlas-hive
index 23b637f3e..27bfac5b0 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-hive
+++ b/dev-support/atlas-docker/Dockerfile.atlas-hive
@@ -20,7 +20,6 @@ ARG HIVE_VERSION
ARG HIVE_HADOOP_VERSION
ARG ATLAS_VERSION
-
COPY ./dist/apache-atlas-${ATLAS_VERSION}-hive-hook.tar.gz /home/atlas/dist/
COPY ./downloads/apache-hive-${HIVE_VERSION}-bin.tar.gz /home/atlas/dist/
COPY ./downloads/hadoop-${HIVE_HADOOP_VERSION}.tar.gz /home/atlas/dist/
@@ -45,8 +44,8 @@ RUN tar xvfz
/home/atlas/dist/apache-hive-${HIVE_VERSION}-bin.tar.gz --directory
cp -f /home/atlas/scripts/hive-site.xml /opt/hive/conf/hive-site.xml && \
cp -f /home/atlas/scripts/atlas-hive-application.properties
/opt/hive/conf/atlas-application.properties
-ENV HIVE_HOME /opt/hive
-ENV HADOOP_HOME /opt/hadoop
-ENV PATH
/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hive/bin:/opt/hadoop/bin
+ENV HIVE_HOME=/opt/hive
+ENV HADOOP_HOME=/opt/hadoop
+ENV
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hive/bin:/opt/hadoop/bin
ENTRYPOINT [ "/home/atlas/scripts/atlas-hive.sh" ]
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-kafka
b/dev-support/atlas-docker/Dockerfile.atlas-kafka
index d7a8e3f07..5c5dba802 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-kafka
+++ b/dev-support/atlas-docker/Dockerfile.atlas-kafka
@@ -19,7 +19,6 @@ FROM atlas-base:latest
ARG ATLAS_VERSION
ARG KAFKA_VERSION
-
COPY ./dist/apache-atlas-${ATLAS_VERSION}-kafka-hook.tar.gz /home/atlas/dist/
COPY ./downloads/kafka_2.12-${KAFKA_VERSION}.tgz /home/atlas/dist/
@@ -35,9 +34,9 @@ RUN tar xvfz /home/atlas/dist/kafka_2.12-${KAFKA_VERSION}.tgz
--directory=/opt/
rm -f /home/atlas/dist/apache-atlas-${ATLAS_VERSION}-kafka-hook.tar.gz && \
cp -f /home/atlas/scripts/atlas-kafka-application.properties
/opt/kafka/config/atlas-application.properties
-ENV KAFKA_HOME /opt/kafka
-ENV KAFKA_CONF_DIR /opt/kafka/config
-ENV PATH
/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/kafka/bin
+ENV KAFKA_HOME=/opt/kafka
+ENV KAFKA_CONF_DIR=/opt/kafka/config
+ENV
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/kafka/bin
EXPOSE 9092
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-solr
b/dev-support/atlas-docker/Dockerfile.atlas-solr
index 17c14bb74..ccad3ada3 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-solr
+++ b/dev-support/atlas-docker/Dockerfile.atlas-solr
@@ -20,8 +20,10 @@ USER 0
# Copy Atlas collections config set
RUN mkdir -p /opt/solr/server/solr/configsets/atlas/conf/lang
+
COPY ./config/solr/*.* /opt/solr/server/solr/configsets/atlas/conf/
COPY ./config/solr/lang/*.* /opt/solr/server/solr/configsets/atlas/conf/lang/
+
RUN chown -R solr:solr /opt/solr/server/solr/configsets/atlas/
# Copy script that creates Atlas collections
