forked from ezsystems/ezplatform-ee
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'platform:master' into studio:master
- Loading branch information
Showing
13 changed files
with
58 additions
and
36 deletions.
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
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
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
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 |
---|---|---|
@@ -1,19 +1,20 @@ | ||
#!/usr/bin/env sh | ||
|
||
# Update package info and selectively update docker-engine (and keep old travis specific config file) | ||
#disabled to save startup time as last travis image already have docker v1.12.0 | ||
#sudo apt-get update | ||
#sudo apt-get --reinstall -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine | ||
#docker -v | ||
docker -v | ||
sudo apt-get update | ||
sudo apt-get --reinstall -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine | ||
docker -v | ||
|
||
# If we need to pin it to a given version: | ||
# sudo apt-get --reinstall -y [...] install docker-engine=1.11.0-0~jessie | ||
# http://apt.dockerproject.org/repo/dists/debian-jessie/main/binary-amd64/Packages | ||
|
||
|
||
#DOCKER_COMPOSE_VERSION="1.8.0" | ||
#echo "\nUpdating Docker Compose to ${DOCKER_COMPOSE_VERSION}" | ||
#sudo rm -f /usr/local/bin/docker-compose | ||
#curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose | ||
#chmod +x docker-compose | ||
#sudo mv docker-compose /usr/local/bin | ||
docker-compose -v | ||
DOCKER_COMPOSE_VERSION="1.13.0" | ||
echo "\nUpdating Docker Compose to ${DOCKER_COMPOSE_VERSION}" | ||
sudo rm -f /usr/local/bin/docker-compose | ||
curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose | ||
chmod +x docker-compose | ||
sudo mv docker-compose /usr/local/bin |
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,22 @@ | ||
FROM solr:6-alpine | ||
|
||
# Copy solr config from the version used by eZ Platform | ||
COPY vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/ /opt/solr/server/tmp | ||
|
||
# Prepare config | ||
RUN mkdir -p /opt/solr/server/ez/template \ | ||
&& cp -R /opt/solr/server/tmp/* /opt/solr/server/ez/template \ | ||
&& cp /opt/solr/server/solr/configsets/basic_configs/conf/currency.xml /opt/solr/server/ez/template \ | ||
&& cp /opt/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml /opt/solr/server/ez/template \ | ||
&& cp /opt/solr/server/solr/configsets/basic_configs/conf/stopwords.txt /opt/solr/server/ez/template \ | ||
&& cp /opt/solr/server/solr/configsets/basic_configs/conf/synonyms.txt /opt/solr/server/ez/template \ | ||
&& cp /opt/solr/server/solr/configsets/basic_configs/conf/elevate.xml /opt/solr/server/ez/template \ | ||
&& cp /opt/solr/server/solr/solr.xml /opt/solr/server/ez \ | ||
&& sed -i.bak '/<updateRequestProcessorChain name="add-unknown-fields-to-the-schema">/,/<\/updateRequestProcessorChain>/d' /opt/solr/server/ez/template/solrconfig.xml \ | ||
&& sed -ie 's/${solr.autoSoftCommit.maxTime:-1}/${solr.autoSoftCommit.maxTime:100}/' /opt/solr/server/ez/template/solrconfig.xml | ||
|
||
# Set our core config as home | ||
ENV SOLR_HOME /opt/solr/server/ez | ||
|
||
# Make sure core is created on startup | ||
CMD ["solr-create", "-c", "collection1", "-d", "/opt/solr/server/ez/template"] |
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
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
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
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
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
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
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 |
---|---|---|
@@ -1,4 +1,4 @@ | ||
version: '2' | ||
version: '2.1' | ||
# Appends services to prod.yml, prod+dev, prod+redis, ..., always latests | ||
|
||
services: | ||
|
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