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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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:
Copy link
Contributor

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.

./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