Skip to content

Commit

Permalink
Merge pull request #6 from nikathone/development
Browse files Browse the repository at this point in the history
Drupal good default Initial PR
  • Loading branch information
Gavin Morris authored Apr 27, 2020
2 parents 18f7f19 + 4f651fa commit e638f04
Show file tree
Hide file tree
Showing 14 changed files with 1,439 additions and 152 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ site
*.retry
.vscode
config/proxy/acme.json

#===================
# Drupal and Mariadb files persistant storage
*_files
codebase
jwt
syn-keys
49 changes: 49 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# The variable used to determine which composer create project to use.
# Run make drupal_init_help for more information
isle_codebase ?= islandora

docker_compose_project ?= islandora

.PHONY: help drupal_init up build down down_rmi_all down_rmi_local drupal_clean clean_local clean

default: drupal_init up solr_init

help:
./scripts/drupal/init.sh --help

drupal_init:
./scripts/drupal/init.sh --codebase $(isle_codebase)

solr_init:
./scripts/solr/create-core.sh

up:
MSYS_NO_PATHCONV=1 docker-compose -p $(docker_compose_project) up --remove-orphans --detach

build:
MSYS_NO_PATHCONV=1 docker-compose -p $(docker_compose_project) up \
--build \
--detach \
--remove-orphans

down:
docker-compose -p $(docker_compose_project) down --remove-orphans

down_rmi_all:
docker-compose -p $(docker_compose_project) down \
--rmi all \
--volumes \
--remove-orphans

down_rmi_local:
docker-compose -p $(docker_compose_project) down \
--rmi local \
--volumes \
--remove-orphans

drupal_clean:
chmod u+w codebase/web/sites/default && rm -rf codebase data/drupal

clean_local: down_rmi_local drupal_clean

clean: down_rmi_all drupal_clean
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Currently there are blank `.keep` files in most of the `config/service` director

* Desktop / laptop / VM
* Docker-CE 19.x+
* If using Docker Desktop for Windows, any stable release *after* 2.2.0.4, or use a 2.2.0.4 with a [patch](https://download-stage.docker.com/win/stable/43542/Docker%20Desktop%20Installer.exe) due to a [bug](https://github.com/docker/for-win/issues/6016)
* Docker-compose version 1.25.x+
* Git 2.0+

Expand Down
Binary file added config/drupal/islandora-starter-config.tar.gz
Binary file not shown.
15 changes: 15 additions & 0 deletions config/drupal/load.environment.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

/**
* This file is included very early. See autoload.files in composer.json and
* https://getcomposer.org/doc/04-schema.md#files
*/

use Dotenv\Dotenv;
use Dotenv\Exception\InvalidPathException;

/**
* Load any .env file. See /.env.example.
*/
$dotenv = Dotenv::createImmutable(__DIR__);
$dotenv->safeLoad();
Loading

0 comments on commit e638f04

Please sign in to comment.