mirror of
https://github.com/sharevb/it-tools.git
synced 2026-11-22 14:01:42 +03:00
Merge branch 'feat/docker-run-to-docker-compose-enh' into chore/all-my-stuffs
# Conflicts: # package.json # pnpm-lock.yaml
This commit is contained in:
commit
cf566442ec
4 files changed
+104
-45
No files matched your search
@@ -61,6 +61,7 @@
|
|||||||
"colord": "^2.9.3",
|
"colord": "^2.9.3",
|
||||||
"composerize-ts": "^0.6.2",
|
"composerize-ts": "^0.6.2",
|
||||||
"countries-db": "^1.2.0",
|
"countries-db": "^1.2.0",
|
||||||
|
"composerize": "^1.6.12",
|
||||||
"country-code-lookup": "^0.1.0",
|
"country-code-lookup": "^0.1.0",
|
||||||
"crc": "^4.3.2",
|
"crc": "^4.3.2",
|
||||||
"cron-validator": "^1.3.1",
|
"cron-validator": "^1.3.1",
|
||||||
|
|||||||
Generated
+36
@@ -74,6 +74,9 @@ dependencies:
|
|||||||
colord:
|
colord:
|
||||||
specifier: ^2.9.3
|
specifier: ^2.9.3
|
||||||
version: 2.9.3
|
version: 2.9.3
|
||||||
|
composerize:
|
||||||
|
specifier: ^1.6.12
|
||||||
|
version: 1.6.12
|
||||||
composerize-ts:
|
composerize-ts:
|
||||||
specifier: ^0.6.2
|
specifier: ^0.6.2
|
||||||
version: 0.6.2
|
version: 0.6.2
|
||||||
@@ -5224,6 +5227,18 @@ packages:
|
|||||||
yamljs: 0.3.0
|
yamljs: 0.3.0
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/composerize@1.6.12:
|
||||||
|
resolution: {integrity: sha512-kPIEgkU2TRT1t4ZrBPUmmRr7RGA0E5JYx0rAgpWBRWNjZRDr2FV/8ne8S8iLp7oaqEX1ubDqZPEQvHaDM9d7cg==}
|
||||||
|
hasBin: true
|
||||||
|
dependencies:
|
||||||
|
composeverter: 1.7.2
|
||||||
|
core-js: 2.6.12
|
||||||
|
deepmerge: 2.2.1
|
||||||
|
invariant: 2.2.4
|
||||||
|
yaml: 1.10.2
|
||||||
|
yargs-parser: 13.1.2
|
||||||
|
dev: false
|
||||||
|
|
||||||
/composeverter@1.7.2:
|
/composeverter@1.7.2:
|
||||||
resolution: {integrity: sha512-gRSCkSU8wJQvmTHQ23wBd2gCdUsns95k3lL7YszZBu5EyA3eac46mI7nVgvk1pZTM0mOmj/E5yurtdYkuVNZRA==}
|
resolution: {integrity: sha512-gRSCkSU8wJQvmTHQ23wBd2gCdUsns95k3lL7YszZBu5EyA3eac46mI7nVgvk1pZTM0mOmj/E5yurtdYkuVNZRA==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -7232,6 +7247,12 @@ packages:
|
|||||||
side-channel: 1.0.4
|
side-channel: 1.0.4
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/invariant@2.2.4:
|
||||||
|
resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
|
||||||
|
dependencies:
|
||||||
|
loose-envify: 1.4.0
|
||||||
|
dev: false
|
||||||
|
|
||||||
/ip-address@7.1.0:
|
/ip-address@7.1.0:
|
||||||
resolution: {integrity: sha512-V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ==}
|
resolution: {integrity: sha512-V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
@@ -7666,6 +7687,7 @@ packages:
|
|||||||
/jsesc@2.5.2:
|
/jsesc@2.5.2:
|
||||||
resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
|
resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
|
||||||
engines: {node: '>=4'}
|
engines: {node: '>=4'}
|
||||||
|
hasBin: true
|
||||||
|
|
||||||
/jsesc@3.0.2:
|
/jsesc@3.0.2:
|
||||||
resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
|
resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
|
||||||
@@ -7842,6 +7864,13 @@ packages:
|
|||||||
is-unicode-supported: 0.1.0
|
is-unicode-supported: 0.1.0
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/loose-envify@1.4.0:
|
||||||
|
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
|
||||||
|
hasBin: true
|
||||||
|
dependencies:
|
||||||
|
js-tokens: 4.0.0
|
||||||
|
dev: false
|
||||||
|
|
||||||
/lossless-json@4.0.2:
|
/lossless-json@4.0.2:
|
||||||
resolution: {integrity: sha512-+z0EaLi2UcWi8MZRxA5iTb6m4Ys4E80uftGY+yG5KNFJb5EceQXOhdW/pWJZ8m97s26u7yZZAYMcKWNztSZssA==}
|
resolution: {integrity: sha512-+z0EaLi2UcWi8MZRxA5iTb6m4Ys4E80uftGY+yG5KNFJb5EceQXOhdW/pWJZ8m97s26u7yZZAYMcKWNztSZssA==}
|
||||||
dev: false
|
dev: false
|
||||||
@@ -11413,6 +11442,13 @@ packages:
|
|||||||
glob: 7.2.3
|
glob: 7.2.3
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/yargs-parser@13.1.2:
|
||||||
|
resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==}
|
||||||
|
dependencies:
|
||||||
|
camelcase: 5.3.1
|
||||||
|
decamelize: 1.2.0
|
||||||
|
dev: false
|
||||||
|
|
||||||
/yargs-parser@18.1.3:
|
/yargs-parser@18.1.3:
|
||||||
resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
|
resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
|
||||||
engines: {node: '>=6'}
|
engines: {node: '>=6'}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
declare module 'composerize' {
|
declare module 'composerize' {
|
||||||
const composerize: (arg: string) => string;
|
const composerize: (commands: string, existingDockerComposeFile?: string, conversion?: string, indent?: number) => string;
|
||||||
export default composerize;
|
export default composerize;
|
||||||
}
|
}
|
||||||
+66
-44
@@ -1,48 +1,94 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { MessageType, composerize } from 'composerize-ts';
|
import composerize from 'composerize';
|
||||||
import { withDefaultOnError } from '@/utils/defaults';
|
|
||||||
import { useDownloadFileFromBase64 } from '@/composable/downloadBase64';
|
import { useDownloadFileFromBase64 } from '@/composable/downloadBase64';
|
||||||
import { textToBase64 } from '@/utils/base64';
|
import { textToBase64 } from '@/utils/base64';
|
||||||
import TextareaCopyable from '@/components/TextareaCopyable.vue';
|
import TextareaCopyable from '@/components/TextareaCopyable.vue';
|
||||||
|
|
||||||
const dockerRun = ref(
|
const dockerRuns = ref(
|
||||||
'docker run -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock:ro --restart always --log-opt max-size=1g nginx',
|
'docker run -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock:ro --restart always --log-opt max-size=1g nginx',
|
||||||
);
|
);
|
||||||
|
const indentSize = useStorage('docker-run-to-compose:indent-size', 4);
|
||||||
|
|
||||||
const conversionResult = computed(() =>
|
const existingDockerComposeFile = ref(
|
||||||
withDefaultOnError(() => composerize(dockerRun.value.trim()), { yaml: '', messages: [] }),
|
'',
|
||||||
);
|
);
|
||||||
|
const format = useStorage('docker-run-to-compose:format', 'latest');
|
||||||
|
const formatOptions = [
|
||||||
|
{ value: 'v2x', label: 'V2 - 2.x' },
|
||||||
|
{ value: 'v3x', label: 'V2 - 3.x' },
|
||||||
|
{ value: 'latest', label: 'CommonSpec' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const conversionResult = computed(() => {
|
||||||
|
try {
|
||||||
|
return { yaml: composerize(dockerRuns.value.trim(), existingDockerComposeFile.value, format.value, indentSize.value), errors: [] };
|
||||||
|
}
|
||||||
|
catch (e: any) {
|
||||||
|
return { yaml: '#see error messages', errors: e.toString().split('\n') };
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const dockerCompose = computed(() => conversionResult.value.yaml);
|
const dockerCompose = computed(() => conversionResult.value.yaml);
|
||||||
const notImplemented = computed(() =>
|
const errors = computed(() => conversionResult.value.errors);
|
||||||
conversionResult.value.messages.filter(msg => msg.type === MessageType.notImplemented).map(msg => msg.value),
|
|
||||||
);
|
|
||||||
const notComposable = computed(() =>
|
|
||||||
conversionResult.value.messages.filter(msg => msg.type === MessageType.notTranslatable).map(msg => msg.value),
|
|
||||||
);
|
|
||||||
const errors = computed(() =>
|
|
||||||
conversionResult.value.messages
|
|
||||||
.filter(msg => msg.type === MessageType.errorDuringConversion)
|
|
||||||
.map(msg => msg.value),
|
|
||||||
);
|
|
||||||
const dockerComposeBase64 = computed(() => `data:application/yaml;base64,${textToBase64(dockerCompose.value)}`);
|
const dockerComposeBase64 = computed(() => `data:application/yaml;base64,${textToBase64(dockerCompose.value)}`);
|
||||||
const { download } = useDownloadFileFromBase64({ source: dockerComposeBase64, filename: 'docker-compose.yml' });
|
const { download } = useDownloadFileFromBase64({ source: dockerComposeBase64, filename: 'docker-compose.yml' });
|
||||||
|
|
||||||
|
const MONACO_EDITOR_OPTIONS = {
|
||||||
|
automaticLayout: true,
|
||||||
|
formatOnType: true,
|
||||||
|
formatOnPaste: true,
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<c-input-text
|
<c-input-text
|
||||||
v-model:value="dockerRun"
|
v-model:value="dockerRuns"
|
||||||
label="Your docker run command:"
|
label="Your docker run command(s):"
|
||||||
style="font-family: monospace"
|
style="font-family: monospace"
|
||||||
multiline
|
multiline
|
||||||
raw-text
|
raw-text
|
||||||
monospace
|
monospace
|
||||||
placeholder="Your docker run command to convert..."
|
placeholder="Your docker run command(s) to convert..."
|
||||||
rows="3"
|
rows="4"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<n-divider />
|
<n-divider />
|
||||||
|
|
||||||
|
<c-label label="Eventually, paste your existing Docker Compose:">
|
||||||
|
<div relative w-full>
|
||||||
|
<c-monaco-editor
|
||||||
|
v-model:value="existingDockerComposeFile"
|
||||||
|
theme="vs-dark"
|
||||||
|
language="yaml"
|
||||||
|
height="100px"
|
||||||
|
:options="MONACO_EDITOR_OPTIONS"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</c-label>
|
||||||
|
|
||||||
|
<n-divider />
|
||||||
|
|
||||||
|
<n-grid cols="4" x-gap="12" w-full>
|
||||||
|
<n-gi span="2">
|
||||||
|
<c-select
|
||||||
|
v-model:value="format"
|
||||||
|
label-position="top"
|
||||||
|
label="Docker Compose format:"
|
||||||
|
:options="formatOptions"
|
||||||
|
placeholder="Select Docker Compose format"
|
||||||
|
/>
|
||||||
|
</n-gi>
|
||||||
|
<n-gi span="2">
|
||||||
|
<n-form-item label="Indent size:" label-placement="top" label-width="100" :show-feedback="false">
|
||||||
|
<n-input-number v-model:value="indentSize" min="0" max="10" w-100px />
|
||||||
|
</n-form-item>
|
||||||
|
</n-gi>
|
||||||
|
</n-grid>
|
||||||
|
|
||||||
|
<n-divider />
|
||||||
|
|
||||||
<TextareaCopyable :value="dockerCompose" language="yaml" />
|
<TextareaCopyable :value="dockerCompose" language="yaml" />
|
||||||
|
|
||||||
<div mt-5 flex justify-center>
|
<div mt-5 flex justify-center>
|
||||||
@@ -51,30 +97,6 @@ const { download } = useDownloadFileFromBase64({ source: dockerComposeBase64, fi
|
|||||||
</c-button>
|
</c-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="notComposable.length > 0">
|
|
||||||
<n-alert title="This options are not translatable to docker-compose" type="info" mt-5>
|
|
||||||
<ul>
|
|
||||||
<li v-for="(message, index) of notComposable" :key="index">
|
|
||||||
{{ message }}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</n-alert>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="notImplemented.length > 0">
|
|
||||||
<n-alert
|
|
||||||
title="This options are not yet implemented and therefore haven't been translated to docker-compose"
|
|
||||||
type="warning"
|
|
||||||
mt-5
|
|
||||||
>
|
|
||||||
<ul>
|
|
||||||
<li v-for="(message, index) of notImplemented" :key="index">
|
|
||||||
{{ message }}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</n-alert>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="errors.length > 0">
|
<div v-if="errors.length > 0">
|
||||||
<n-alert title="The following errors occured" type="error" mt-5>
|
<n-alert title="The following errors occured" type="error" mt-5>
|
||||||
<ul>
|
<ul>
|
||||||
|
|||||||
Reference in new issue
Block a user