rename containerName to image

Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2022-12-25 00:43:26 +01:00
parent 6cca3ceb6c
commit 4a69d53a67
4 changed files with 15 additions and 16 deletions

View file

@ -23,7 +23,6 @@ sed -i 's|environmentVariables:|environment:|' containers.yml
sed -i '/displayName:/d' containers.yml sed -i '/displayName:/d' containers.yml
sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml
sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml
sed -i 's|containerName:|image:|' containers.yml
sed -i '/: \[\]/d' containers.yml sed -i '/: \[\]/d' containers.yml
sed -i 's|- name: |- |' containers.yml sed -i 's|- name: |- |' containers.yml

View file

@ -11,7 +11,7 @@
"additionalProperties": false, "additionalProperties": false,
"minProperties": 11, "minProperties": 11,
"properties": { "properties": {
"containerName": { "image": {
"type": "string" "type": "string"
}, },
"depends_on": { "depends_on": {

View file

@ -9,7 +9,7 @@
"nextcloud-aio-nextcloud" "nextcloud-aio-nextcloud"
], ],
"displayName": "Apache", "displayName": "Apache",
"containerName": "nextcloud/aio-apache", "image": "nextcloud/aio-apache",
"ports": [ "ports": [
"%APACHE_PORT%/tcp" "%APACHE_PORT%/tcp"
], ],
@ -47,7 +47,7 @@
"container_name": "nextcloud-aio-database", "container_name": "nextcloud-aio-database",
"depends_on": [], "depends_on": [],
"displayName": "Database", "displayName": "Database",
"containerName": "nextcloud/aio-postgresql", "image": "nextcloud/aio-postgresql",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"5432" "5432"
@ -87,7 +87,7 @@
"nextcloud-aio-imaginary" "nextcloud-aio-imaginary"
], ],
"displayName": "Nextcloud", "displayName": "Nextcloud",
"containerName": "nextcloud/aio-nextcloud", "image": "nextcloud/aio-nextcloud",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"9000" "9000"
@ -169,7 +169,7 @@
"container_name": "nextcloud-aio-redis", "container_name": "nextcloud-aio-redis",
"depends_on": [], "depends_on": [],
"displayName": "Redis", "displayName": "Redis",
"containerName": "nextcloud/aio-redis", "image": "nextcloud/aio-redis",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"6379" "6379"
@ -196,7 +196,7 @@
"container_name": "nextcloud-aio-collabora", "container_name": "nextcloud-aio-collabora",
"depends_on": [], "depends_on": [],
"displayName": "Collabora", "displayName": "Collabora",
"containerName": "nextcloud/aio-collabora", "image": "nextcloud/aio-collabora",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"9980" "9980"
@ -222,7 +222,7 @@
"container_name": "nextcloud-aio-talk", "container_name": "nextcloud-aio-talk",
"depends_on": [], "depends_on": [],
"displayName": "Talk", "displayName": "Talk",
"containerName": "nextcloud/aio-talk", "image": "nextcloud/aio-talk",
"ports": [ "ports": [
"%TALK_PORT%/tcp", "%TALK_PORT%/tcp",
"%TALK_PORT%/udp" "%TALK_PORT%/udp"
@ -251,7 +251,7 @@
"container_name": "nextcloud-aio-borgbackup", "container_name": "nextcloud-aio-borgbackup",
"depends_on": [], "depends_on": [],
"displayName": "Borgbackup", "displayName": "Borgbackup",
"containerName": "nextcloud/aio-borgbackup", "image": "nextcloud/aio-borgbackup",
"ports": [], "ports": [],
"internalPorts": [], "internalPorts": [],
"environmentVariables": [ "environmentVariables": [
@ -324,7 +324,7 @@
"container_name": "nextcloud-aio-watchtower", "container_name": "nextcloud-aio-watchtower",
"depends_on": [], "depends_on": [],
"displayName": "Watchtower", "displayName": "Watchtower",
"containerName": "nextcloud/aio-watchtower", "image": "nextcloud/aio-watchtower",
"ports": [], "ports": [],
"internalPorts": [], "internalPorts": [],
"environmentVariables": [ "environmentVariables": [
@ -345,7 +345,7 @@
"depends_on": [], "depends_on": [],
"container_name": "nextcloud-aio-domaincheck", "container_name": "nextcloud-aio-domaincheck",
"displayName": "Domaincheck", "displayName": "Domaincheck",
"containerName": "nextcloud/aio-domaincheck", "image": "nextcloud/aio-domaincheck",
"ports": [ "ports": [
"%APACHE_PORT%/tcp" "%APACHE_PORT%/tcp"
], ],
@ -365,7 +365,7 @@
"container_name": "nextcloud-aio-clamav", "container_name": "nextcloud-aio-clamav",
"depends_on": [], "depends_on": [],
"displayName": "ClamAV", "displayName": "ClamAV",
"containerName": "nextcloud/aio-clamav", "image": "nextcloud/aio-clamav",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"3310" "3310"
@ -389,7 +389,7 @@
"container_name": "nextcloud-aio-onlyoffice", "container_name": "nextcloud-aio-onlyoffice",
"depends_on": [], "depends_on": [],
"displayName": "OnlyOffice", "displayName": "OnlyOffice",
"containerName": "nextcloud/aio-onlyoffice", "image": "nextcloud/aio-onlyoffice",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"80" "80"
@ -417,7 +417,7 @@
"container_name": "nextcloud-aio-imaginary", "container_name": "nextcloud-aio-imaginary",
"depends_on": [], "depends_on": [],
"displayName": "Imaginary", "displayName": "Imaginary",
"containerName": "nextcloud/aio-imaginary", "image": "nextcloud/aio-imaginary",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"9000" "9000"
@ -434,7 +434,7 @@
"container_name": "nextcloud-aio-fulltextsearch", "container_name": "nextcloud-aio-fulltextsearch",
"depends_on": [], "depends_on": [],
"displayName": "Fulltextsearch", "displayName": "Fulltextsearch",
"containerName": "nextcloud/aio-fulltextsearch", "image": "nextcloud/aio-fulltextsearch",
"ports": [], "ports": [],
"internalPorts": [ "internalPorts": [
"9200" "9200"

View file

@ -179,7 +179,7 @@ class ContainerDefinitionFetcher
$containers[] = new Container( $containers[] = new Container(
$entry['container_name'], $entry['container_name'],
$entry['displayName'], $entry['displayName'],
$entry['containerName'], $entry['image'],
$entry['restartPolicy'], $entry['restartPolicy'],
$entry['maxShutdownTime'], $entry['maxShutdownTime'],
$ports, $ports,