-
Notifications
You must be signed in to change notification settings - Fork 60
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
Drupal good default Initial PR #6
Merged
g7morris
merged 111 commits into
Islandora-Devops:development
from
nikathone:development
Apr 27, 2020
Merged
Changes from all commits
Commits
Show all changes
111 commits
Select commit
Hold shift + click to select a range
5ddac5a
Added config files related to drupal, nginx, php and supervisord.
nikathone 2889ded
Added bin folder which contains needed script for the app/drupal cont…
nikathone 03219d6
Added app/drupal dockerfile and created the base webserver dockerfile.
nikathone 02bfe96
Moved supervisord config under nginx and php image.
nikathone 7038cba
Made a first pass for the default drupal dockerfile and docker-compos…
nikathone 55dce13
Adjust auto install flag.
nikathone b5927f5
Added a drupal local url env var.
nikathone ef68ea4
Switch the auto install to false.
nikathone e59bdd7
Making a force push for the config app runner script.
nikathone 793e7fc
Setting back auto install to true and using data folder for drupal da…
nikathone 3f43def
Checking for the settings.isle.php file instead of the app name speci…
nikathone 307f8bd
Added a script to init drupal codebase and setup settings.php
nikathone 82f308b
Removed drupal, php and nginx config confd templates since they will …
nikathone f256988
Updated init.sh to include needed packages and removed app bin folder…
nikathone dd0b376
Added default drupal hash salt variable and pinned to an exact versio…
nikathone ba72e11
Made sure that drupal.Dockerfile copy the templates from the base image.
nikathone 0a9e024
Removed reference to the php and nginx base image.
nikathone be78e5a
Adding print message when downloading required packages.
nikathone 706f618
The drupal.Dockerfile support by default the islandora codebase.
nikathone 261527d
Initial workflow implementation.
nikathone c9c9c74
Checking docker and compose version and also checking out the code..
nikathone e249efd
Added more steps to check the home page.
nikathone 85d10bc
Fixing sed for isle settings on other distribution.
nikathone eeff652
Running some of the commands step by step.
nikathone 995a422
Trying to build the image only to see why it's failing with docker co…
nikathone fe47b25
Remove unneeded args.
nikathone edc9798
Wrong tag name.
nikathone a98676a
Adding gitlab-ci for testing.
nikathone c89f39d
Trying with official docker dind.
nikathone c3b9254
Remove multiline.
nikathone b5834b0
Only running mov commands.
nikathone 5ca71d6
Making sure init.sh is executable.
nikathone 570bbb1
Making sure I am delaing with ubuntu.
nikathone c404e69
Checking files permissions in Gitlab CI.
nikathone ea1e741
Making sure that checking composer won't break the CI run in gitlab.
nikathone cb2a169
Replaced the HOME environment variable with tilda.
nikathone f82c70e
Removed the interactivity of the container for none Darwin system.
nikathone 794add2
Removed the interactivity of the container for none Darwin system.
nikathone 48e4b63
A typo for the remove flag.
nikathone 95af8f0
Running make in the gitlab CI.
nikathone 6dbc203
Using drupal-composer/drupal-project for drupal codebase and try a si…
nikathone b36b153
adding Solr back in; adding default Islandora config
noahwsmith 7db310b
Added config files related to drupal, nginx, php and supervisord.
nikathone d40d744
Added bin folder which contains needed script for the app/drupal cont…
nikathone c48f91c
Added app/drupal dockerfile and created the base webserver dockerfile.
nikathone c077ba9
Moved supervisord config under nginx and php image.
nikathone d37a019
Made a first pass for the default drupal dockerfile and docker-compos…
nikathone 92ab0fc
Adjust auto install flag.
nikathone edcd5d6
Added a drupal local url env var.
nikathone 5b2f5c9
Switch the auto install to false.
nikathone de4673d
Making a force push for the config app runner script.
nikathone 2f1d827
Setting back auto install to true and using data folder for drupal da…
nikathone 2165831
Checking for the settings.isle.php file instead of the app name speci…
nikathone 4e2cbee
Added a script to init drupal codebase and setup settings.php
nikathone d6ce527
Removed drupal, php and nginx config confd templates since they will …
nikathone 77640c6
Updated init.sh to include needed packages and removed app bin folder…
nikathone 7fc6fca
Added default drupal hash salt variable and pinned to an exact versio…
nikathone 880fcf4
Made sure that drupal.Dockerfile copy the templates from the base image.
nikathone dd526ac
Removed reference to the php and nginx base image.
nikathone 5c77e98
Adding print message when downloading required packages.
nikathone 26e7bf5
The drupal.Dockerfile support by default the islandora codebase.
nikathone 5c03d7b
Initial workflow implementation.
nikathone cfd6d21
Checking docker and compose version and also checking out the code..
nikathone 5c33860
Added more steps to check the home page.
nikathone c065491
Fixing sed for isle settings on other distribution.
nikathone 03442fe
Running some of the commands step by step.
nikathone 119eb5c
Trying to build the image only to see why it's failing with docker co…
nikathone dd51bf6
Remove unneeded args.
nikathone e906fd6
Wrong tag name.
nikathone 62749ce
Adding gitlab-ci for testing.
nikathone 5e94865
Trying with official docker dind.
nikathone 7bcf43d
Remove multiline.
nikathone f95a3e1
Only running mov commands.
nikathone 5ad6e76
Making sure init.sh is executable.
nikathone e3de101
Making sure I am delaing with ubuntu.
nikathone 1203f30
Checking files permissions in Gitlab CI.
nikathone f379f2c
Making sure that checking composer won't break the CI run in gitlab.
nikathone 22dd00b
Replaced the HOME environment variable with tilda.
nikathone 64602cf
Removed the interactivity of the container for none Darwin system.
nikathone 5c01761
Removed the interactivity of the container for none Darwin system.
nikathone 3fa97c9
A typo for the remove flag.
nikathone 7a0a530
Running make in the gitlab CI.
nikathone 20e5373
Using drupal-composer/drupal-project for drupal codebase and try a si…
nikathone 12cad86
adding Solr back in; adding default Islandora config
noahwsmith e217a2c
Merge branch 'development' of github.com:nikathone/isle-dc into devel…
noahwsmith 87420ce
force add islandora starter config tar
noahwsmith 905b1be
Removed some debugging RUN command
nikathone 8724307
Removed commented code.
nikathone b9657a9
adding README stub
noahwsmith 5dffa06
Removed unused variable.
nikathone 46453b8
Removed more unused vars in drupal init.
nikathone 3e01df5
md syntax on new doc
noahwsmith deb5773
Fix drupal config logic
birkland 779e580
Merge pull request #2 from birkland/fix-drupal-init
nikathone f38ea6a
Fix wrong messaging on package install.
nikathone 24102ee
removed the tests scripts for now.
nikathone 13cbba1
Making sure that the docker composer container is running as the curr…
nikathone 4d4d6c4
Setting islandora codebase as default and cleaning up codebase in cas…
nikathone a0a0b95
Checking for vendor autoload to decide if we should run composer inst…
nikathone 2b40dd3
Remove composer install flag and simplify if statements for config in…
nikathone 3b3f96e
Removing the snippet and using a pre-configured settings.php
nikathone 1da4ce9
Instead of using sed for settings.php customization we use the pre-co…
nikathone 3ee03e8
Fix paths on Windows + git bash
birkland 7819a6f
Merge pull request #3 from birkland/windows-path-compat
nikathone d410bcc
Set timezone to UTC, switch default workdir to docroot, change mariad…
nikathone 01841fd
Initial implementation for the sample.env and adjusted drupal db and …
nikathone c7cefab
removed quotation on the nginx port.
nikathone 1783d45
Adding an local env to overwrite the default dockerfile.
nikathone 055825f
Removed the bind mount of drupal db data on local folder.
nikathone 0921584
Revert to mariadb service.
nikathone 4f651fa
Merge branch 'development' into development
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
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,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 |
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
Binary file not shown.
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,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(); |
Oops, something went wrong.
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.
Minor non-issue. Should be added to
.PHONY
targets.