diff --git a/src/nginxconfig/generators/ext/docker.js b/src/nginxconfig/generators/ext/docker.js new file mode 100644 index 0000000..524e602 --- /dev/null +++ b/src/nginxconfig/generators/ext/docker.js @@ -0,0 +1,30 @@ +/* +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 'FROM nginx:latest\nCOPY . /etc/nginx/'; +}; + diff --git a/src/nginxconfig/generators/index.js b/src/nginxconfig/generators/index.js index bd97832..ccfa738 100644 --- a/src/nginxconfig/generators/index.js +++ b/src/nginxconfig/generators/index.js @@ -36,6 +36,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 dockerConf from './ext/docker'; export default (domains, global) => { const files = {}; @@ -43,6 +44,10 @@ export default (domains, global) => { // Base nginx config files['nginx.conf'] = toConf(nginxConf(domains, global)); + // Dockerfile + if (global.docker.dockerfile.computed) + files['Dockerfile'] = dockerConf(); + // Modularised configs if (global.tools.modularizedStructure.computed) { // Domain config diff --git a/src/nginxconfig/i18n/en/common.js b/src/nginxconfig/i18n/en/common.js index 42c1450..4eb4afa 100644 --- a/src/nginxconfig/i18n/en/common.js +++ b/src/nginxconfig/i18n/en/common.js @@ -35,6 +35,7 @@ export default { https: 'HTTPS', letsEncrypt: 'Let\'s Encrypt', python: 'Python', + docker: 'Docker', wordPress: 'WordPress', drupal: 'Drupal', magento: 'Magento', diff --git a/src/nginxconfig/i18n/en/templates/global_sections/docker.js b/src/nginxconfig/i18n/en/templates/global_sections/docker.js new file mode 100644 index 0000000..a1df1dd --- /dev/null +++ b/src/nginxconfig/i18n/en/templates/global_sections/docker.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. +*/ + +import common from '../../common'; + +export default { + dockerfile: `Include Dockerfile to run nginx with ${common.docker}`, +}; diff --git a/src/nginxconfig/i18n/en/templates/global_sections/index.js b/src/nginxconfig/i18n/en/templates/global_sections/index.js index 32c3a17..8a8e3ac 100644 --- a/src/nginxconfig/i18n/en/templates/global_sections/index.js +++ b/src/nginxconfig/i18n/en/templates/global_sections/index.js @@ -33,5 +33,6 @@ import python from './python'; import reverseProxy from './reverse_proxy'; import security from './security'; import tools from './tools'; +import docker from './docker'; -export default { https, logging, nginx, performance, php, python, reverseProxy, security, tools }; +export default { https, logging, nginx, performance, php, python, reverseProxy, security, tools, docker }; diff --git a/src/nginxconfig/templates/global_sections/docker.vue b/src/nginxconfig/templates/global_sections/docker.vue new file mode 100644 index 0000000..05bbfdc --- /dev/null +++ b/src/nginxconfig/templates/global_sections/docker.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/nginxconfig/templates/global_sections/index.js b/src/nginxconfig/templates/global_sections/index.js index 1b850bc..d67939b 100644 --- a/src/nginxconfig/templates/global_sections/index.js +++ b/src/nginxconfig/templates/global_sections/index.js @@ -32,4 +32,5 @@ export { default as ReverseProxy } from './reverse_proxy'; export { default as Performance } from './performance'; export { default as Logging } from './logging'; export { default as NGINX } from './nginx'; +export { default as Docker } from './docker'; export { default as Tools } from './tools';