You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2021/01/19 19:42:21 UTC
[lucene-solr] branch reference_impl_dev updated: @1254 Rename
folder.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 1e99ed8 @1254 Rename folder.
1e99ed8 is described below
commit 1e99ed80b730f38dc7e7373b7e743e71c6a890e8
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jan 19 13:41:52 2021 -0600
@1254 Rename folder.
---
.../dev/Dockerfile | 0
.../dev/start-solr.sh | 0
solr/reference-branch/docker/solr-build/Dockerfile | 23 ++++++++++++++++
solr/reference-branch/docker/solr-image/Dockerfile | 28 +++++++++++++++++++
.../network/remove-network.sh | 0
.../network/start-network.sh | 0
solr/reference-branch/prod/Dockerfile | 27 ++++++++++++++++++
.../prod/start-solr.sh | 0
.../{reference_branch => reference-branch}/test.sh | 0
solr/reference_branch/prod/Dockerfile | 32 ----------------------
10 files changed, 78 insertions(+), 32 deletions(-)
diff --git a/solr/reference_branch/dev/Dockerfile b/solr/reference-branch/dev/Dockerfile
similarity index 100%
rename from solr/reference_branch/dev/Dockerfile
rename to solr/reference-branch/dev/Dockerfile
diff --git a/solr/reference_branch/dev/start-solr.sh b/solr/reference-branch/dev/start-solr.sh
similarity index 100%
rename from solr/reference_branch/dev/start-solr.sh
rename to solr/reference-branch/dev/start-solr.sh
diff --git a/solr/reference-branch/docker/solr-build/Dockerfile b/solr/reference-branch/docker/solr-build/Dockerfile
new file mode 100644
index 0000000..3e32bfe
--- /dev/null
+++ b/solr/reference-branch/docker/solr-build/Dockerfile
@@ -0,0 +1,23 @@
+FROM openjdk:11-jdk-slim
+
+ENV BUILD_DIR=/build/solr
+ENV INSTALL_DIR=/opt/solr
+
+RUN mkdir -p ${INSTALL_DIR}
+RUN mkdir -p ${BUILD_DIR}
+
+RUN apt-get -y update; apt-get -y upgrade; apt-get -y install git
+
+RUN cd "${BUILD_DIR}"; git clone https://github.com/apache/lucene-solr.git --branch reference_impl --single-branch reference_impl; \
+cd "${BUILD_DIR}/reference_impl"; ./gradlew -p solr distTar; \
+cp -r "${BUILD_DIR}"/reference_impl/solr/packaging/build/distributions/solr-*.tgz /opt/solr; \
+rm -rf /root/.m2; rm -rf /root/.ivy2; \
+#rm -r "${BUILD_DIR}"; \
+apt-get -y remove git; apt -y autoclean; apt -y autoremove
+
+WORKDIR ${INSTALL_DIR}
+
+ENV PATH=$PATH:/opt/solr/bin
+
+
+ENTRYPOINT "/bin/bash"
\ No newline at end of file
diff --git a/solr/reference-branch/docker/solr-image/Dockerfile b/solr/reference-branch/docker/solr-image/Dockerfile
new file mode 100644
index 0000000..88f7db4
--- /dev/null
+++ b/solr/reference-branch/docker/solr-image/Dockerfile
@@ -0,0 +1,28 @@
+FROM openjdk:11-jdk-slim
+
+ENV BUILD_DIR=/build/solr
+ENV INSTALL_DIR=/opt/solr
+
+RUN mkdir -p ${INSTALL_DIR}
+RUN mkdir -p ${BUILD_DIR}
+
+ADD start-solr.sh /start-solr.sh
+
+RUN chmod +x /start-solr.sh
+
+RUN apt-get -y update; apt-get -y upgrade; apt-get -y install git
+
+RUN cd "${BUILD_DIR}"; git clone https://github.com/apache/lucene-solr.git --branch reference_impl --single-branch reference_impl; \
+cd "${BUILD_DIR}/reference_impl"; ./gradlew -p solr distTar; -Dversion=9.0.0-miller_ref_impl; \
+cp -r packaging/*miller_ref_impl/* /opt/solr; chmod +x /opt/solr/bin/solr; \
+rm -r /root/.m2; \
+#rm -r "${BUILD_DIR}"; \
+apt-get -y remove git; apt -y autoclean; apt -y autoremove
+
+WORKDIR ${INSTALL_DIR}
+
+ENV PATH=$PATH:/opt/solr/bin
+
+
+ENTRYPOINT "/bin/bash"
+#ENTRYPOINT "/start-solr.sh"
\ No newline at end of file
diff --git a/solr/reference_branch/network/remove-network.sh b/solr/reference-branch/network/remove-network.sh
similarity index 100%
rename from solr/reference_branch/network/remove-network.sh
rename to solr/reference-branch/network/remove-network.sh
diff --git a/solr/reference_branch/network/start-network.sh b/solr/reference-branch/network/start-network.sh
similarity index 100%
rename from solr/reference_branch/network/start-network.sh
rename to solr/reference-branch/network/start-network.sh
diff --git a/solr/reference-branch/prod/Dockerfile b/solr/reference-branch/prod/Dockerfile
new file mode 100644
index 0000000..d52af84
--- /dev/null
+++ b/solr/reference-branch/prod/Dockerfile
@@ -0,0 +1,27 @@
+FROM openjdk:11-jdk-slim
+
+ENV BUILD_DIR=/build/solr
+ENV INSTALL_DIR=/opt/solr
+
+RUN mkdir -p ${INSTALL_DIR}
+RUN mkdir -p ${BUILD_DIR}
+
+ADD start-solr.sh /start-solr.sh
+
+RUN chmod +x /start-solr.sh
+
+RUN apt-get -y update; apt-get -y upgrade; apt-get -y install git
+
+RUN cd "${BUILD_DIR}"; git clone https://github.com/apache/lucene-solr.git --branch reference_impl --single-branch reference_impl; \
+cd "${BUILD_DIR}/reference_impl"; ./gradlew -p solr distTar; -Dversion=9.0.0-miller_ref_impl; \
+cp -r packaging/*miller_ref_impl/* /opt/solr; chmod +x /opt/solr/bin/solr; \
+rm -r "${BUILD_DIR}"; rm -r /root/.ivy2;rm -r /root/.m2; \
+apt-get -y remove git; apt -y autoclean; apt -y autoremove
+
+WORKDIR ${INSTALL_DIR}
+
+ENV PATH=$PATH:/opt/solr/bin
+
+
+ENTRYPOINT "/bin/bash"
+#ENTRYPOINT "/start-solr.sh"
\ No newline at end of file
diff --git a/solr/reference_branch/prod/start-solr.sh b/solr/reference-branch/prod/start-solr.sh
similarity index 100%
rename from solr/reference_branch/prod/start-solr.sh
rename to solr/reference-branch/prod/start-solr.sh
diff --git a/solr/reference_branch/test.sh b/solr/reference-branch/test.sh
similarity index 100%
rename from solr/reference_branch/test.sh
rename to solr/reference-branch/test.sh
diff --git a/solr/reference_branch/prod/Dockerfile b/solr/reference_branch/prod/Dockerfile
deleted file mode 100644
index f73dbd2..0000000
--- a/solr/reference_branch/prod/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM openjdk:11-jdk-slim
-
-ENV BUILD_DIR=/build/solr
-ENV INSTALL_DIR=/opt/solr
-ENV ANT_INSTALL_DIR=/opt/ant
-ENV ANT_TGZ_FILE="apache-ant-1.9.15"
-
-RUN mkdir -p ${INSTALL_DIR}
-RUN mkdir -p ${BUILD_DIR}
-
-ADD start-solr.sh /start-solr.sh
-ADD start-solr.sh /start-solr.sh
-
-RUN chmod +x /start-solr.sh
-
-RUN apt-get -y update; apt-get -y upgrade; apt-get -y install git;apt-get -y install wget; mkdir -p "${ANT_INSTALL_DIR}"; \
-wget http://mirror.cc.columbia.edu/pub/software/apache/ant/binaries/${ANT_TGZ_FILE}-bin.tar.gz; \
-tar -xzvf ${ANT_TGZ_FILE}-bin.tar.gz;cp -r ${ANT_TGZ_FILE}/* /opt/ant
-
-RUN cd "${BUILD_DIR}"; git clone https://github.com/apache/lucene-solr.git --branch reference_impl --single-branch reference_impl; \
-cd "${BUILD_DIR}/reference_impl"; /opt/ant/bin/ant ivy-bootstrap;cd solr; /opt/ant/bin/ant package -Dversion=9.0.0-miller_ref_impl; \
-cp -r build/*miller_ref_impl/* /opt/solr; chmod +x /opt/solr/bin/solr; \
-rm -r "${BUILD_DIR}"; rm -r /root/.ivy2; apt-get -y remove ant;\
-apt-get -y remove git; apt -y autoclean; apt -y autoremove
-
-WORKDIR ${INSTALL_DIR}
-
-ENV PATH=$PATH:/opt/solr/bin:/opt/ant/bin
-
-
-ENTRYPOINT "/bin/bash"
-#ENTRYPOINT "/start-solr.sh"
\ No newline at end of file