Merge pull request #5662 from bradymiller/insane-dev-update_1_y

updates

CONTRIBUTING.md

@@ -81,6 +81,7 @@ The OpenEMR development docker environment has a very rich advanced feature set.
 16. [Place/remove testing sql ssl certificate and testing sql ssl client key/cert](#dev_tools_ssl)
 17. [CouchDB integration](#dev_tools_couchdb)
 18. [LDAP integration](#dev_tools_ldap)
+19. [Test webroot value](#dev_tools_webroot)
 
 ---
 
@@ -395,6 +396,17 @@ The OpenEMR development docker environment has a very rich advanced feature set.
           ```sh
           docker exec -i $(docker ps | grep _openemr | cut -f 1 -d " ") sh -c '/root/devtools ldap-ssl-client-off'
           ```
+19. <a name="dev_tools_webroot"></a>Test webroot value.
+    - The default setup of the docker development environments are with a blank webroot, however, it is a good idea to also test with a webroot setting. There is an option to set the webroot to openemr.
+    - Note this dev tool requires the use of the openemr-cmd script, which is discussed above and can find instructions to install and use openemr-cmd script at [install openemr-cmd](https://github.com/openemr/openemr-devops/tree/master/utilities/openemr-cmd).
+    - Set webroot to blank:
+      ```sh
+      openemr-cmd change-webroot-blank
+      ```
+    - Set webroot to `openemr`:
+      ```sh
+      openemr-cmd change-webroot-openemr
+      ```
 
 ### Non-docker Use
 

docker/development-insane/docker-compose.yml

@@ -100,6 +100,21 @@ services:
     - 9082:443
     volumes:
     - ../..:/var/www/localhost/htdocs/openemr
+    environment:
+      DEBUG_COLORS: "true"
+      TERM: xterm-256color
+      COLORTERM: truecolor
+      OPENEMR_DOCKER_ENV_TAG: insane-dev-docker
+      FORCE_NO_BUILD_MODE: "yes"
+      EMPTY: "yes"
+  openemr-8-1:
+    restart: always
+    image: openemr/openemr:flex-3.16
+    ports:
+    - 8083:80
+    - 9083:443
+    volumes:
+    - ../..:/var/www/localhost/htdocs/openemr
     - couchdbvolume:/couchdb/data
     environment:
       DEBUG_COLORS: "true"
@@ -117,7 +132,7 @@ services:
       XDEBUG_CLIENT_HOST: host.docker.internal
       GITHUB_COMPOSER_TOKEN: c313de1ed5a00eb6ff9309559ec9ad01fcc553f0
       GITHUB_COMPOSER_TOKEN_ENCODED: ZWU5YWIwZWNiM2ZlN2I4YThlNGQ0ZWZiNjMyNDQ5MjFkZTJhMTY2OQo=
-      OPENEMR_SETTING_site_addr_oath: 'https://localhost:9085'
+      OPENEMR_SETTING_site_addr_oath: 'https://localhost:9083'
       OPENEMR_SETTING_oauth_password_grant: 3
       OPENEMR_SETTING_rest_system_scopes_api: 1
       OPENEMR_SETTING_rest_api: 1
@@ -133,21 +148,6 @@ services:
       OPENEMR_SETTING_couchdb_ssl_allow_selfsigned: 1
       OPENEMR_SETTING_gbl_ldap_host: 'ldap://openldap:389'
       OPENEMR_SETTING_gbl_ldap_dn: 'cn={login},dc=example,dc=org'
-  openemr-8-1:
-    restart: always
-    image: openemr/openemr:flex-3.16
-    ports:
-    - 8083:80
-    - 9083:443
-    volumes:
-    - ../..:/var/www/localhost/htdocs/openemr
-    environment:
-      DEBUG_COLORS: "true"
-      TERM: xterm-256color
-      COLORTERM: truecolor
-      OPENEMR_DOCKER_ENV_TAG: insane-dev-docker
-      FORCE_NO_BUILD_MODE: "yes"
-      EMPTY: "yes"
   openemr-edge:
     restart: always
     image: openemr/openemr:flex-edge