Skip to content

Commit

Permalink
Fix back KeyValue args
Browse files Browse the repository at this point in the history
  • Loading branch information
Maëlys Bras de fer committed Jun 25, 2021
1 parent e99c5b5 commit 3edcacf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion dockers/manager/back/app/docker/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def resolve_create_container(
):

labels = kv_to_dict(labels)
env = kv_to_dict(environment)
mounts = graphql_to_docker_mounts(mounts)
ports = graphql_to_docker_ports(ports)
if start:
Expand All @@ -91,7 +92,7 @@ def resolve_create_container(
labels=labels,
command=command,
user=user,
environment=dict(environment),
environment=env,
privileged=privileged,
read_only=readonly,
mounts=mounts, #
Expand Down
5 changes: 3 additions & 2 deletions dockers/manager/back/app/docker/volume.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from app.utils import registerQuery, registerMutation, createType
from . import docker_client, KeyValue, formatTime
from . import docker_client, KeyValue, formatTime, kv_to_dict
from docker.errors import APIError
from app.exception import PMException

Expand Down Expand Up @@ -36,7 +36,8 @@ def resolve_volume_used_by(volume, _, onlyRunning):
@registerMutation("createDockerVolume")
def resolve_create_volume(*_, input):
try:
docker_client.volumes.create(input.get("name"), labels=dict(input["labels"]))
labels = kv_to_dict(input["labels"])
docker_client.volumes.create(input.get("name"), labels=labels)
except APIError as e:
raise PMException(e.explanation)
except Exception as e:
Expand Down
2 changes: 1 addition & 1 deletion dockers/manager/back/schema/docker/container.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ type DockerContainer {
ports: [DockerContainerPort!]!
status: DockerContainerStatus!
privileged: Boolean!
ps: [DockerContainerProcess]
ps: [DockerContainerProcess!]
restartPolicy: DockerRestartPolicy
}

Expand Down

0 comments on commit 3edcacf

Please sign in to comment.