Merge pull request #581 from ukkopahis/env-yml-rename

menu: rename env.yml to docker-compose-base.yml

Author: Slyke

.templates/env.yml renamed to .templates/docker-compose-base.yml

@@ -1,13 +1,14 @@
-networks:
+version: '3.6'
 
+networks:
   default:
     driver: bridge
     ipam:
       driver: default
-
   nextcloud:
     driver: bridge
     internal: true
     ipam:
       driver: default
 
+services:

docs/Developers/Menu-System.md

@@ -82,9 +82,9 @@ The Build Stack menu will execute the `runPostBuildHook()` function in the final
 The selected services' yaml configuration is already loaded into memory before the build stack process is started.
 
 1. Run prebuildHooks.
-2. Create a new in memory `docker-compose.yml` structure.
-3. Merge the `./.templates/env.yml` file into `docker-compose.yml` memory.
+2. Read `./.templates/docker-compose-base.yml` file into a in memory yaml structure.
+3. Add selected services into the in memory structure.
 4. If it exists merge the `./compose-override.yml` file into memory
-5. Write the docker-compose in memory yaml structure to disk.
+5. Write the in memory yaml structure to disk `./docker-compose.yml`.
 6. Run postbuildHooks.
-7. Run `postbuild.sh` if it exists, with the list of services built.
+7. Run `postbuild.sh` if it exists, with the list of services built.

docs/Updates/migration-network-change.md

@@ -33,16 +33,16 @@ If you maintain your `docker-compose.yml` by hand, you can adopt the networking
 3. Append the contents of the following file to your `docker-compose.yml`:
 
 	```
-	~/IOTstack/.templates/env.yml
+	~/IOTstack/.templates/docker-compose-base.yml
 	```
 
 	For example:
 
 	```
-	$ cat ~/IOTstack/.templates/env.yml >>~/IOTstack/docker-compose.yml
+	$ cat ~/IOTstack/.templates/docker-compose-base.yml >>~/IOTstack/docker-compose.yml
 	```
 
-	The `env.yml` file is the same for both *old-menu* and *master* branches.
+	The `docker-compose-base.yml` file is named `env.yml` in the *old-menu* branch.
 
 4. If you run the NextCloud service then:
 

scripts/buildstack_menu.py

@@ -52,19 +52,12 @@ def buildServices(): # TODO: Move this into a dependency so that it can be execu
     global dockerComposeServicesYaml
     try:
       runPrebuildHook()
-      dockerFileYaml = {}
       menuStateFileYaml = {}
-      dockerFileYaml["version"] = "3.6"
-      dockerFileYaml["services"] = {}
-      menuStateFileYaml["services"] = {}
-      dockerFileYaml["services"] = dockerComposeServicesYaml
       menuStateFileYaml["services"] = dockerComposeServicesYaml
 
-      if os.path.exists(envFile):
-        with open(r'%s' % envFile) as fileEnv:
-          envSettings = yaml.load(fileEnv)
-        mergedYaml = mergeYaml(envSettings, dockerFileYaml)
-        dockerFileYaml = mergedYaml
+      with open(r'%s' % envFile) as fileEnv:
+        dockerFileYaml = yaml.load(fileEnv)
+      dockerFileYaml["services"] = dockerComposeServicesYaml
 
       if os.path.exists(composeOverrideFile):
         with open(r'%s' % composeOverrideFile) as fileOverride:

scripts/deps/consts.py

@@ -6,7 +6,7 @@
 buildSettingsFileName = '/build_settings.yml'
 buildCache = servicesDirectory + 'docker-compose.save.yml'
 composeOverrideFile = './compose-override.yml'
-envFile = templatesDirectory + 'env.yml'
+envFile = templatesDirectory + 'docker-compose-base.yml'
 dockerPathOutput = './docker-compose.yml'
 servicesFileName = 'service.yml'
 ifCheckList = ['eth0', 'wlan0']