-
Notifications
You must be signed in to change notification settings - Fork 218
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
XDOCKER-87: create image for external SOLR, add example compose file #14
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# ARG used in FROM must come first | ||
ARG SOLR_VERSION=7.5.0 | ||
|
||
FROM busybox as buildenv | ||
|
||
# ARG for build must come after the FROM statement | ||
ARG XWIKI_VERSION=10.9 | ||
ARG XWIKI_URL_PREFIX="https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/${XWIKI_VERSION}" | ||
|
||
WORKDIR /var/xwiki-solr-temp/ | ||
|
||
COPY ./solr-init.sh . | ||
RUN wget "${XWIKI_URL_PREFIX}/xwiki-platform-search-solr-server-data-${XWIKI_VERSION}.jar" | ||
|
||
FROM solr:${SOLR_VERSION} | ||
|
||
COPY --from=buildenv /var/xwiki-solr-temp/ /docker-entrypoint-initdb.d/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
# --------------------------------------------------------------------------- | ||
# See the NOTICE file distributed with this work for additional | ||
# information regarding copyright ownership. | ||
# | ||
# This is free software; you can redistribute it and/or modify it | ||
# under the terms of the GNU Lesser General Public License as | ||
# published by the Free Software Foundation; either version 2.1 of | ||
# the License, or (at your option) any later version. | ||
# | ||
# This software is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
# Lesser General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU Lesser General Public | ||
# License along with this software; if not, write to the Free | ||
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
# --------------------------------------------------------------------------- | ||
version: '2' | ||
networks: | ||
bridge: | ||
driver: bridge | ||
services: | ||
web: | ||
# Use an already built XWiki image from DockerHub. | ||
image: "xwiki:10.9-postgres-tomcat" | ||
container_name: xwiki-postgres-tomcat-web | ||
depends_on: | ||
- db | ||
ports: | ||
- "8080:8080" | ||
# The DB_USER/DB_PASSWORD/DB_HOST variables are used in the hibernate.cfg.xml file. | ||
environment: | ||
- DB_USER=xwiki | ||
- DB_PASSWORD=xwiki | ||
- DB_DATABASE=xwiki | ||
- DB_HOST=xwiki-postgres-db | ||
- INDEX_HOST=index | ||
# Provide a name instead of an auto-generated id for the xwiki permanent directory configured in the Dockerfile, | ||
# to make it simpler to identify in 'docker volume ls'. | ||
volumes: | ||
- xwiki-data:/usr/local/xwiki | ||
networks: | ||
- bridge | ||
# The container that runs PostgreSQL | ||
db: | ||
image: "postgres:9.6" | ||
container_name: xwiki-postgres-db | ||
volumes: | ||
- postgres-data:/var/lib/postgresql/data | ||
environment: | ||
- POSTGRES_ROOT_PASSWORD=xwiki | ||
- POSTGRES_PASSWORD=xwiki | ||
- POSTGRES_USER=xwiki | ||
- POSTGRES_DB=xwiki | ||
- POSTGRES_INITDB_ARGS="--encoding=UTF8" | ||
networks: | ||
- bridge | ||
# The container running Apache SOLR as search index for xwiki | ||
index: | ||
image: "xwiki/solr:10.9" | ||
container_name: xwiki-solr-index | ||
build: | ||
context: ./contrib/solr | ||
args: | ||
- SOLR_VERSION=7.5.0 | ||
- XWIKI_VERSION=10.9 | ||
volumes: | ||
- solr-data:/opt/solr/server/solr | ||
networks: | ||
- bridge | ||
volumes: | ||
postgres-data: {} | ||
xwiki-data: {} | ||
solr-data: {} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this doing and where is solr-init.sh coming from?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
solr-init.sh
was already there and has not been changed.See: https://github.com/xwiki-contrib/docker-xwiki/blob/master/contrib/solr/solr-init.sh
Look into the file, it has comments. It looks for the *.jar and unzips it to
/opt/solr/server/solr/