Merge branch 'instance/fid' into instance/fid_adlr
Showing
- .env.local 13 additions, 0 deletions.env.local
- .gitignore 3 additions, 0 deletions.gitignore
- Gruntfile.js 13 additions, 3 deletionsGruntfile.js
- composer.json 5 additions, 1 deletioncomposer.json
- composer.lock 16 additions, 0 deletionscomposer.lock
- devops/docker/composer1/Dockerfile 0 additions, 0 deletionsdevops/docker/composer1/Dockerfile
- devops/docker/composer1/entrypoint.sh 0 additions, 0 deletionsdevops/docker/composer1/entrypoint.sh
- devops/docker/composer2/Dockerfile 23 additions, 0 deletionsdevops/docker/composer2/Dockerfile
- devops/docker/composer2/entrypoint.sh 34 additions, 0 deletionsdevops/docker/composer2/entrypoint.sh
- devops/docker/db/mariadb_10_11/Dockerfile 19 additions, 0 deletionsdevops/docker/db/mariadb_10_11/Dockerfile
- devops/docker/db/mariadb_10_11/entrypoint.sh 6 additions, 0 deletionsdevops/docker/db/mariadb_10_11/entrypoint.sh
- devops/docker/db/mariadb_10_3/Dockerfile 19 additions, 0 deletionsdevops/docker/db/mariadb_10_3/Dockerfile
- devops/docker/db/mariadb_10_3/entrypoint.sh 29 additions, 0 deletionsdevops/docker/db/mariadb_10_3/entrypoint.sh
- devops/docker/env/entrypoint.sh 17 additions, 9 deletionsdevops/docker/env/entrypoint.sh
- devops/docker/grunt/Dockerfile 20 additions, 0 deletionsdevops/docker/grunt/Dockerfile
- devops/docker/grunt/entrypoint.sh 1 addition, 1 deletiondevops/docker/grunt/entrypoint.sh
- devops/docker/httpd/Dockerfile 40 additions, 0 deletionsdevops/docker/httpd/Dockerfile
- devops/docker/httpd/assets/debug.conf 3 additions, 0 deletionsdevops/docker/httpd/assets/debug.conf
- devops/docker/httpd/assets/ssl.conf 6 additions, 0 deletionsdevops/docker/httpd/assets/ssl.conf
- devops/docker/httpd/vufind.conf 79 additions, 0 deletionsdevops/docker/httpd/vufind.conf
Please register or sign in to comment