Added docker compose generator if docker is enabled (#175)

* Added docker compose generator if docker is enabled

* Fixed version to 3.3

* fixed name in to_yaml.js

* Apply suggestions from code review

Co-authored-by: Matt (IPv4) Cowley <me@mattcowley.co.uk>

src/nginxconfig/generators/index.js

@@ -25,6 +25,7 @@ THE SOFTWARE.
 */
 
 import toConf from './to_conf';
+import toYaml from './to_yaml';
 import nginxConf from './conf/nginx.conf';
 import websiteConf from './conf/website.conf';
 import letsEncryptConf from './conf/letsencrypt.conf';
@@ -36,6 +37,7 @@ import proxyConf from './conf/proxy.conf';
 import wordPressConf from './conf/wordpress.conf';
 import drupalConf from './conf/drupal.conf';
 import magentoConf from './conf/magento.conf';
+import dockerComposeYaml from './yaml/dockerCompose.yaml';
 import dockerConf from './ext/docker';
 
 export default (domains, global) => {
@@ -48,6 +50,9 @@ export default (domains, global) => {
     if (global.docker.dockerfile.computed)
         files['Dockerfile'] = dockerConf();
 
+    if (global.docker.dockerCompose.computed)
+        files['docker-compose.yaml'] = toYaml(dockerComposeYaml());
+
     // Modularised configs
     if (global.tools.modularizedStructure.computed) {
         // Domain config

src/nginxconfig/generators/to_yaml.js

@@ -0,0 +1,31 @@
+/*
+Copyright 2020 DigitalOcean
+
+This code is licensed under the MIT License.
+You may obtain a copy of the License at
+https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+const yaml = require('js-yaml');
+
+export default yamlConf => {
+    return yaml.safeDump(yamlConf);
+};

src/nginxconfig/generators/yaml/dockerCompose.yaml.js

@@ -0,0 +1,39 @@
+/*
+Copyright 2020 DigitalOcean
+
+This code is licensed under the MIT License.
+You may obtain a copy of the License at
+https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+export default () => {
+    return {
+        version: '3.3',
+        services:{
+            nginx: {
+                build: {
+                    context: '.',
+                    dockerfile: 'Dockerfile',
+                },
+            },
+        },
+    };
+};

src/nginxconfig/i18n/en/common.js

@@ -36,6 +36,7 @@ export default {
 	letsEncrypt: 'Let\'s Encrypt',
 	python: 'Python',
 	docker: 'Docker',
+	dockerCompose: 'Docker Compose',
 	wordPress: 'WordPress',
 	drupal: 'Drupal',
 	magento: 'Magento',

src/nginxconfig/i18n/en/templates/global_sections/docker.js

@@ -28,4 +28,5 @@ import common from '../../common';
 
 export default {
     dockerfile: `Include Dockerfile to run nginx with ${common.docker}`,
+    dockerCompose: 'Include docker-compose to run nginx with docker-compose',
 };

src/nginxconfig/templates/global_sections/docker.vue

@@ -43,6 +43,23 @@ THE SOFTWARE.
                 </div>
             </div>
         </div>
+        <div v-if="dockerfile" class="field is-horizontal">
+            <div class="field-label">
+                <label class="label">{{ i18n.common.dockerCompose }}</label>
+            </div>
+            <div class="field-body">
+                <div class="field">
+                    <div :class="`control${dockerComposeChanged ? ' is-changed' : ''}`">
+                        <div class="checkbox">
+                            <PrettyCheck v-model="dockerCompose" class="p-default p-curve p-fill p-icon">
+                                <i slot="extra" class="icon fas fa-check"></i>
+                                {{ i18n.templates.globalSections.docker.dockerCompose }}
+                            </PrettyCheck>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
@@ -54,6 +71,10 @@ THE SOFTWARE.
 
     const defaults = {
         dockerfile: {
+            default: false,
+            enabled: true,
+        },
+        dockerCompose: {
             default: false,
             enabled: false,
         },
@@ -76,5 +97,20 @@ THE SOFTWARE.
             };
         },
         computed: computedFromDefaults(defaults, 'docker'), // Getters & setters for the delegated data
+        watch: {
+            // Disable docker-compose if dockerfile is disabled
+            '$props.data.dockerfile': {
+                handler(data) {
+                    if (data.computed) {
+                        this.$props.data.dockerCompose.enabled = true;
+                        this.$props.data.dockerCompose.computed = this.$props.data.dockerCompose.value;
+                    } else {
+                        this.$props.data.dockerCompose.enabled = false;
+                        this.$props.data.dockerCompose.computed = false;
+                    }
+                },
+                deep: true,
+            },
+        },
     };
 </script>