Skip to content

Commit

Permalink
Merge branch 'master' into feature/coder-standards-installer
Browse files Browse the repository at this point in the history
  • Loading branch information
jaapjan authored Jun 19, 2019
2 parents 6192067 + 6d23abb commit f11b950
Show file tree
Hide file tree
Showing 67 changed files with 11,549 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ before_install:
- docker --version
- docker-compose --version
- phpenv config-rm xdebug.ini
- composer install --prefer-dist --no-interaction
- COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction
- sudo rm /usr/local/bin/docker-compose || true
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
Expand Down
29 changes: 17 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,41 @@
"drupal-composer/drupal-scaffold": "^2.0.0",
"cweagans/composer-patches": "^1.0",
"drush/drush": "8.*@stable",
"goalgorilla/open_social": "dev-8.x-3.x",
"goalgorilla/open_social_scripts": "dev-master"
"goalgorilla/open_social": "dev-8.x-6.x",
"goalgorilla/open_social_scripts": "dev-master",
"drupal/search_api_solr": "2.x-dev"
},
"require-dev": {
"jcalderonzumba/gastonjs": "~1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
"mikey179/vfsStream": "~1.2",
"mikey179/vfsstream": "~1.2",
"symfony/css-selector": "~2.8",
"behat/behat": "3.*@stable",
"behat/mink": "1.*@stable",
"behat/mink-extension": "*",
"behat/mink-goutte-driver": "*",
"behat/mink-selenium2-driver": "*",
"dealerdirect/phpcodesniffer-composer-installer": "*",
"drupal/coder": "dev-8.x-2.x",
"drupal/coder": "8.3.1",
"drupal/drupal-extension": "^3.4",
"phpmd/phpmd": "@stable",
"pdepend/pdepend": "2.1.0",
"sebastian/phpcpd": "*",
"sebastian/phpcpd": "@stable",
"phpunit/phpunit": "^6.5",
"phpunit/php-timer": "^1.0.9",
"drupal/console":"1.1",
"drupal/console": "@stable",
"zaporylie/composer-drupal-optimizations": "^1.0",
"squizlabs/html_codesniffer": "*"
},
"repositories": [
{
"repositories": {
"0": {
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"1": {
"type": "composer",
"url": "https://asset-packagist.org"
},
{
"3": {
"type": "package",
"package": {
"name": "squizlabs/html_codesniffer",
Expand All @@ -54,8 +55,12 @@
"reference": "master"
}
}
},
"social": {
"type": "git",
"url": "https://github.com/goalgorilla/open_social.git"
}
],
},
"scripts": {
"post-install-cmd": [
"DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
Expand Down
95 changes: 95 additions & 0 deletions docker-compose.blackfire.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
version: "2"

services:
web:
image: goalgorilla/open_social_docker:dev
volumes:
- ./:/var/www
links:
- db
- mailcatcher
- blackfire
environment:
- VIRTUAL_HOST=social.dev
- DRUPAL_SETTINGS=development
ports:
- "80"
network_mode: "bridge"
container_name: social_web

db:
image: mysql:5.6
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=social
volumes:
- db_data:/var/lib/mysql
ports:
- "3306"
network_mode: "bridge"
container_name: social_db
command: mysqld --max_allowed_packet=16M

mailcatcher:
image: schickling/mailcatcher
environment:
- VIRTUAL_HOST=mailcatcher.social.dev
- VIRTUAL_PORT=1080
ports:
- "1080"
network_mode: "bridge"
container_name: social_mailcatcher

selenium:
image: selenium/standalone-firefox-debug:2.48.2
volumes:
- ./html/profiles/contrib/social/tests/behat/features/files/:/files
links:
- web:web
ports:
- "4444"
- "5900"
cap_add:
- NET_ADMIN
- NET_RAW
network_mode: "bridge"
container_name: social_selenium

behat:
image: goalgorilla/open_social_docker:dev
volumes:
- ./:/var/www
links:
- web:web
- db:db
- selenium:selenium
environment:
- DRUPAL_SETTINGS=development
network_mode: "bridge"
container_name: social_behat

blackfire:
image: blackfire/blackfire
environment:
# Exposes the host BLACKFIRE_SERVER_ID and BLACKFIRE_SERVER_TOKEN environment variables.
# Find the values for these on https://blackfire.io/docs/integrations/docker while logged in.
# For ease of use on multiple project copy those export statements to ~/.bash_profile.
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
network_mode: "bridge"
container_name: social_blackfire

cron:
image: goalgorilla/open_social_docker:cron
volumes:
- ./:/var/www
links:
- db
- mailcatcher
environment:
- DRUPAL_SETTINGS=development
network_mode: "bridge"
container_name: social_cron

volumes:
db_data:
34 changes: 22 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
links:
- db
- mailcatcher
- blackfire
- solr
environment:
- VIRTUAL_HOST=social.dev
- DRUPAL_SETTINGS=development
Expand Down Expand Up @@ -68,17 +68,6 @@ services:
network_mode: "bridge"
container_name: social_behat

blackfire:
image: blackfire/blackfire
environment:
# Exposes the host BLACKFIRE_SERVER_ID and BLACKFIRE_SERVER_TOKEN environment variables.
# Find the values for these on https://blackfire.io/docs/integrations/docker while logged in.
# For ease of use on multiple project copy those export statements to ~/.bash_profile.
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
network_mode: "bridge"
container_name: social_blackfire

cron:
image: goalgorilla/open_social_docker:cron
volumes:
Expand All @@ -91,5 +80,26 @@ services:
network_mode: "bridge"
container_name: social_cron

solr:
image: solr:6.6
hostname: solr
volumes:
- os_solr_data:/opt/solr/server/solr/mycores
- ./docker/solr/6.x/config_one/:/solr-conf/conf:cached
environment:
- SOLR_SOLR_MEM_SIZE=512m
- PARTIAL_SEARCH_ENABLED=false
- VIRTUAL_HOST=solr.social.local
- VIRTUAL_PORT=8983
ports:
- "8983"
entrypoint:
- solr-precreate
- drupal
- /solr-conf
network_mode: "bridge"
container_name: social_solr

volumes:
db_data:
os_solr_data:
27 changes: 27 additions & 0 deletions docker/solr/6.x/config_one/elevate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!--
This file allows you to boost certain search items to the top of search
results. You can find out an item's ID by searching directly on the Solr
server. Search API generally constructs item IDs (esp. for entities) as:
$document->id = "$site_hash-$index_id-$datasource:$entity_id:$language_id";
If you want this file to be automatically re-loaded when a Solr commit takes
place (e.g., if you have an automatic script active which updates elevate.xml
according to newly-indexed data), place it into Solr's data/ directory.
Otherwise, place it with the other configuration files into the conf/
directory.
See http://wiki.apache.org/solr/QueryElevationComponent for more information.
-->

<elevate>
<!-- Example for ranking the node #789 first in searches for "example query": -->
<!--
<query text="example query">
<doc id="ab12cd34-site_index-entity:789:en" />
</query>
-->
<!-- Multiple <query> elements can be specified, contained in one <elevate>. -->
<!-- <query text="...">...</query> -->
</elevate>
14 changes: 14 additions & 0 deletions docker/solr/6.x/config_one/mapping-ISOLatin1Accent.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file contains character mappings for the default fulltext field type.
# The source characters (on the left) will be replaced by the respective target
# characters before any other processing takes place.
# Lines starting with a pound character # are ignored.
#
# For sensible defaults, use the mapping-ISOLatin1Accent.txt file distributed
# with the example application of your Solr version.
#
# Examples:
# "À" => "A"
# "\u00c4" => "A"
# "\u00c4" => "\u0041"
# "æ" => "ae"
# "\n" => " "
7 changes: 7 additions & 0 deletions docker/solr/6.x/config_one/protwords.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#-----------------------------------------------------------------------
# This file blocks words from being operated on by the stemmer and word delimiter.
&amp;
&lt;
&gt;
&#039;
&quot;
Loading

0 comments on commit f11b950

Please sign in to comment.