Skip to content

Commit f25e630

Browse files
lint++
1 parent 55730c7 commit f25e630

File tree

10 files changed

+81
-78
lines changed

10 files changed

+81
-78
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Common software in shell image: ```curl less git less rsync wget nano mc vim mar
1818
| ```h1cr.io/website/filebrowser``` | ```latest``` | |
1919
| ```h1cr.io/website/nginx-console``` | ```latest``` | |
2020
| ```h1cr.io/website/nginx-static``` | ```latest``` | |
21-
| ```h1cr.io/website/node``` | ```12```, ```14```, ```16```, ```18``` | ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) |
22-
| ```h1cr.io/website/node-console``` | ```12```, ```14```, ```16```, ```18``` | ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) |
21+
| ```h1cr.io/website/node``` | ```12```, ```14```, ```16```, ```18``` | ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) |
22+
| ```h1cr.io/website/node-console``` | ```12```, ```14```, ```16```, ```18``` | ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) ![Package: nodejs](https://repology.org/badge/latest-versions/nodejs.svg?header=nodejs) |
2323
| ```h1cr.io/website/php-apache``` | ```5.6```, ```7.2```, ```7.3```, ```7.4```, ```8.0``` | ![Package: php](https://repology.org/badge/latest-versions/php.svg?header=php) ![Package: php](https://repology.org/badge/latest-versions/php.svg?header=php) |
2424
| ```h1cr.io/website/php-apache-shell``` | ```5.6```, ```7.2```, ```7.3```, ```7.4```, ```8.0``` | ![Package: php](https://repology.org/badge/latest-versions/php.svg?header=php) ![Package: php](https://repology.org/badge/latest-versions/php.svg?header=php) |
2525
| ```h1cr.io/website/php-console``` | ```5.6```, ```7.2```, ```7.3```, ```7.4```, ```8.0``` | ![Package: php](https://repology.org/badge/latest-versions/php.svg?header=php) ![Package: php](https://repology.org/badge/latest-versions/php.svg?header=php) |

filebrowser/tags.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
module.exports = {
3-
"latest": {
4-
"latest": true,
5-
"args": {}
3+
latest: {
4+
latest: true,
5+
args: {}
66
}
7-
}
7+
};

generate.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ Mustache.escape = function (text) { return text; };
1515

1616
const ignoredDirectory = [
1717
'content',
18-
'node_modules',
18+
'node_modules'
1919
];
2020

2121
const repo = argv.repository || 'h1cr.io/website';
2222

2323
async function saveTemplated(sourceFile, context, outputFile) {
2424
const template = await readFile(sourceFile);
25-
if(outputFile.endsWith('.db')){
25+
if (outputFile.endsWith('.db')) {
2626
await writeFile(outputFile, template);
27-
}else{
27+
} else {
2828
const content = Mustache.render(template.toString('utf-8'), context);
29-
await writeFile(outputFile, content, { encoding: 'utf-8' });
29+
await writeFile(outputFile, content, { encoding: 'utf-8' });
3030
}
31-
console.log(`Saved templated '${sourceFile}' into '${outputFile}'`)
31+
console.log(`Saved templated '${sourceFile}' into '${outputFile}'`);
3232
}
3333

3434
const generateImage = async (source, output, context) => {
@@ -51,11 +51,12 @@ const generateImage = async (source, output, context) => {
5151

5252
const main = async () => {
5353
if (!argv.f) {
54-
throw new Error("Usage: node generate.js -f image [--bats bats-path] [-g|-b|-t|-p]");
55-
return;
54+
console.error('Usage: node generate.js -f image [--bats bats-path] [-g|-b|-t|-p]');
55+
process.exit(-1);
5656
}
57+
5758
if (!argv.g && !argv.b && !argv.t && !argv.p) {
58-
throw new Error("Abort. Nothing to do!");
59+
console.error('Abort. Nothing to do!');
5960
return;
6061
}
6162
const files = await readDir(__dirname);
@@ -118,7 +119,7 @@ const main = async () => {
118119
}
119120
};
120121

121-
main().then(console.log).catch(err => {
122+
main().catch(err => {
122123
console.error(err);
123124
console.error(err.stack);
124125
process.exit(1);

lib.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ const {spawn} = require('child_process');
22

33
const runProcess = (cmd, args = [], opts = {}) => new Promise((resolve, reject) => {
44
const env = opts.env || {};
5-
console.log(`Started: ${cmd} ${args.join(" ")}`);
5+
console.log(`Started: ${cmd} ${args.join(' ')}`);
66
const proc = spawn(cmd, args, {
77
env: { ...process.env, ...env},
8-
stdio: 'inherit',
8+
stdio: 'inherit'
99
});
1010
proc.on('close', (code) => {
1111
if (code !== 0) {
@@ -16,5 +16,5 @@ const runProcess = (cmd, args = [], opts = {}) => new Promise((resolve, reject)
1616
});
1717

1818
module.exports = {
19-
runProcess,
20-
}
19+
runProcess
20+
};

nginx-console/tags.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
'use strict';
22

3-
module.exports=require('../nginx-static/tags');
3+
module.exports=require('../nginx-static/tags');

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php-apache/tags.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
const common = [
2-
'bcmath', 'bz2', 'calendar', 'exif', 'iconv', 'intl', 'gd', 'ldap',
2+
'bcmath', 'bz2', 'calendar', 'exif', 'iconv', 'intl', 'gd', 'ldap',
33
'mbstring', 'memcached', 'mysql', 'mysqli', 'pdo_mysql', 'pdo_pgsql',
44
'pgsql', 'redis', 'soap', 'opcache', 'zip'
55
];
66

77
const WP_CLI_VERSION = '2.5.0';
88

99
module.exports = {
10-
"5.6": {
11-
"args": {
12-
"PHP_VERSION": "5.6",
10+
'5.6': {
11+
args: {
12+
PHP_VERSION: '5.6',
1313
WP_CLI_VERSION,
14-
"MODULES": [...common, 'mcrypt', 'ioncube', 'mysql'].sort().join(" "),
15-
"IONCUBE": true,
14+
MODULES: [...common, 'mcrypt', 'ioncube', 'mysql'].sort().join(' '),
15+
IONCUBE: true
1616
}
1717
},
18-
"7.2": {
19-
"args": {
20-
"PHP_VERSION": "7.2",
21-
"MODULES": [...common, 'mcrypt', 'ioncube', 'mysql'].sort().join(" "),
18+
'7.2': {
19+
args: {
20+
PHP_VERSION: '7.2',
21+
MODULES: [...common, 'mcrypt', 'ioncube', 'mysql'].sort().join(' '),
2222
WP_CLI_VERSION,
23-
"IONCUBE": true,
23+
IONCUBE: true
2424
}
2525
},
26-
"7.3": {
27-
"args": {
28-
"PHP_VERSION": "7.3",
29-
"MODULES": [...common, 'mcrypt', 'ioncube', 'mysql'].sort().join(" "),
26+
'7.3': {
27+
args: {
28+
PHP_VERSION: '7.3',
29+
MODULES: [...common, 'mcrypt', 'ioncube', 'mysql'].sort().join(' '),
3030
WP_CLI_VERSION,
31-
"IONCUBE": true,
31+
IONCUBE: true
3232
}
3333
},
34-
"7.4": {
35-
"args": {
36-
"PHP_VERSION": "7.4",
37-
"MODULES": [...common, 'mcrypt', 'mysql'].sort().join(" "),
34+
'7.4': {
35+
args: {
36+
PHP_VERSION: '7.4',
37+
MODULES: [...common, 'mcrypt', 'mysql'].sort().join(' '),
3838
WP_CLI_VERSION,
39-
"IONCUBE": true,
39+
IONCUBE: true
4040
},
41-
"packages": ["php"],
41+
packages: ['php']
4242
},
43-
"8.0": {
44-
"args": {
45-
"PHP_VERSION": "8.0",
46-
"MODULES": [...common, 'mcrypt', 'mysql'].sort().join(" "),
43+
'8.0': {
44+
args: {
45+
PHP_VERSION: '8.0',
46+
MODULES: [...common, 'mcrypt', 'mysql'].sort().join(' '),
4747
WP_CLI_VERSION,
48-
"IONCUBE": false,
48+
IONCUBE: false
4949
},
50-
"latest": true,
51-
"packages": ["php"],
52-
},
50+
latest: true,
51+
packages: ['php']
52+
}
5353
};

python-passenger/tags.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
'use strict';
22

3-
const PYTHON_LIBS = "libmariadbclient18 libmariadbclient-dev libffi-dev libssl-dev libjpeg-dev libpng-dev libxml2-dev libxslt1-dev libjpeg62 python3-dev build-essential";
3+
const PYTHON_LIBS = 'libmariadbclient18 libmariadbclient-dev libffi-dev libssl-dev libjpeg-dev libpng-dev libxml2-dev libxslt1-dev libjpeg62 python3-dev build-essential';
44

55

66
module.exports = {
7-
"3.7": {
8-
"args": {
9-
"PY_VERSION": "3.7",
10-
PYTHON_LIBS,
7+
'3.7': {
8+
args: {
9+
PY_VERSION: '3.7',
10+
PYTHON_LIBS
1111
}
1212
},
13-
"3.8": {
14-
"args": {
15-
"PY_VERSION": "3.8",
16-
PYTHON_LIBS,
13+
'3.8': {
14+
args: {
15+
PY_VERSION: '3.8',
16+
PYTHON_LIBS
1717
},
18-
"packages": ["python"],
18+
packages: ['python']
1919
},
20-
"3.9": {
21-
"args": {
22-
"PY_VERSION": "3.9",
23-
PYTHON_LIBS,
20+
'3.9': {
21+
args: {
22+
PY_VERSION: '3.9',
23+
PYTHON_LIBS
2424
},
25-
"latest": true,
26-
"packages": ["python"],
27-
},
28-
}
25+
latest: true,
26+
packages: ['python']
27+
}
28+
};

ruby-passenger/tags.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
'use strict';
22
module.exports = {
3-
"2.7": {
4-
"args": {
5-
"RUBY_VERSION": "2.7",
3+
'2.7': {
4+
args: {
5+
RUBY_VERSION: '2.7'
66
},
7-
"packages": ["ruby"]
7+
packages: ['ruby']
88
},
9-
"3.0": {
10-
"args": {
11-
"RUBY_VERSION": "3.0",
9+
'3.0': {
10+
args: {
11+
RUBY_VERSION: '3.0'
1212
},
13-
"latest": true,
14-
"packages": ["ruby"]
13+
latest: true,
14+
packages: ['ruby']
1515
}
16-
}
16+
};

0 commit comments

Comments
 (0)