Added nginx dockerfile generator (#171)
* Added nginx dockerfile generator * Applied requested changes * Update src/nginxconfig/generators/to_conf.js Co-authored-by: Matt (IPv4) Cowley <me@mattcowley.co.uk> * Update src/nginxconfig/generators/to_conf.js Co-authored-by: Matt (IPv4) Cowley <me@mattcowley.co.uk> * Update src/nginxconfig/templates/global_sections/docker.vue Co-authored-by: Matt (IPv4) Cowley <me@mattcowley.co.uk> * Update src/nginxconfig/i18n/en/common.js Co-authored-by: Matt (IPv4) Cowley <me@mattcowley.co.uk> * Update src/nginxconfig/i18n/en/templates/global_sections/docker.js Co-authored-by: Matt (IPv4) Cowley <me@mattcowley.co.uk> Co-authored-by: Matt (IPv4) Cowley <me@mattcowley.co.uk>pull/177/head
parent
956e504d63
commit
150b42c304
|
@ -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/';
|
||||||
|
};
|
||||||
|
|
|
@ -36,6 +36,7 @@ import proxyConf from './conf/proxy.conf';
|
||||||
import wordPressConf from './conf/wordpress.conf';
|
import wordPressConf from './conf/wordpress.conf';
|
||||||
import drupalConf from './conf/drupal.conf';
|
import drupalConf from './conf/drupal.conf';
|
||||||
import magentoConf from './conf/magento.conf';
|
import magentoConf from './conf/magento.conf';
|
||||||
|
import dockerConf from './ext/docker';
|
||||||
|
|
||||||
export default (domains, global) => {
|
export default (domains, global) => {
|
||||||
const files = {};
|
const files = {};
|
||||||
|
@ -43,6 +44,10 @@ export default (domains, global) => {
|
||||||
// Base nginx config
|
// Base nginx config
|
||||||
files['nginx.conf'] = toConf(nginxConf(domains, global));
|
files['nginx.conf'] = toConf(nginxConf(domains, global));
|
||||||
|
|
||||||
|
// Dockerfile
|
||||||
|
if (global.docker.dockerfile.computed)
|
||||||
|
files['Dockerfile'] = dockerConf();
|
||||||
|
|
||||||
// Modularised configs
|
// Modularised configs
|
||||||
if (global.tools.modularizedStructure.computed) {
|
if (global.tools.modularizedStructure.computed) {
|
||||||
// Domain config
|
// Domain config
|
||||||
|
|
|
@ -35,6 +35,7 @@ export default {
|
||||||
https: 'HTTPS',
|
https: 'HTTPS',
|
||||||
letsEncrypt: 'Let\'s Encrypt',
|
letsEncrypt: 'Let\'s Encrypt',
|
||||||
python: 'Python',
|
python: 'Python',
|
||||||
|
docker: 'Docker',
|
||||||
wordPress: 'WordPress',
|
wordPress: 'WordPress',
|
||||||
drupal: 'Drupal',
|
drupal: 'Drupal',
|
||||||
magento: 'Magento',
|
magento: 'Magento',
|
||||||
|
|
|
@ -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}`,
|
||||||
|
};
|
|
@ -33,5 +33,6 @@ import python from './python';
|
||||||
import reverseProxy from './reverse_proxy';
|
import reverseProxy from './reverse_proxy';
|
||||||
import security from './security';
|
import security from './security';
|
||||||
import tools from './tools';
|
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 };
|
||||||
|
|
|
@ -0,0 +1,80 @@
|
||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="field is-horizontal">
|
||||||
|
<div class="field-label">
|
||||||
|
<label class="label">{{ i18n.common.docker }}</label>
|
||||||
|
</div>
|
||||||
|
<div class="field-body">
|
||||||
|
<div class="field">
|
||||||
|
<div :class="`control${dockerfileChanged ? ' is-changed' : ''}`">
|
||||||
|
<div class="checkbox">
|
||||||
|
<PrettyCheck v-model="dockerfile" class="p-default p-curve p-fill p-icon">
|
||||||
|
<i slot="extra" class="icon fas fa-check"></i>
|
||||||
|
{{ i18n.templates.globalSections.docker.dockerfile }}
|
||||||
|
</PrettyCheck>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import i18n from '../../i18n';
|
||||||
|
import delegatedFromDefaults from '../../util/delegated_from_defaults';
|
||||||
|
import computedFromDefaults from '../../util/computed_from_defaults';
|
||||||
|
import PrettyCheck from 'pretty-checkbox-vue/check';
|
||||||
|
|
||||||
|
const defaults = {
|
||||||
|
dockerfile: {
|
||||||
|
default: false,
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'GlobalDocker', // Component name
|
||||||
|
display: i18n.common.docker, // Display name for tab
|
||||||
|
key: 'docker', // Key for data in parent
|
||||||
|
delegated: delegatedFromDefaults(defaults), // Data the parent will present here
|
||||||
|
components: {
|
||||||
|
PrettyCheck,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
data: Object, // Data delegated back to us from parent
|
||||||
|
},
|
||||||
|
data () {
|
||||||
|
return {
|
||||||
|
i18n,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: computedFromDefaults(defaults, 'docker'), // Getters & setters for the delegated data
|
||||||
|
};
|
||||||
|
</script>
|
|
@ -32,4 +32,5 @@ export { default as ReverseProxy } from './reverse_proxy';
|
||||||
export { default as Performance } from './performance';
|
export { default as Performance } from './performance';
|
||||||
export { default as Logging } from './logging';
|
export { default as Logging } from './logging';
|
||||||
export { default as NGINX } from './nginx';
|
export { default as NGINX } from './nginx';
|
||||||
|
export { default as Docker } from './docker';
|
||||||
export { default as Tools } from './tools';
|
export { default as Tools } from './tools';
|
||||||
|
|
Loading…
Reference in New Issue