From a2adff231886b249e8658b764e4e0342e265a11d Mon Sep 17 00:00:00 2001 From: Akilan Date: Wed, 3 Feb 2021 19:31:51 +0400 Subject: [PATCH] restructued folders in docker --- go.mod | 2 +- server/docker/containers/README | 7 +++++++ .../docker/{ => containers}/docker-ubuntu-sshd/Dockerfile | 0 .../docker/{ => containers}/docker-ubuntu-sshd/README.md | 0 .../{ => containers}/docker-ubuntu-sshd/scripts/start | 0 server/docker/docker.go | 8 ++++++++ server/server.go | 3 ++- 7 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 server/docker/containers/README rename server/docker/{ => containers}/docker-ubuntu-sshd/Dockerfile (100%) rename server/docker/{ => containers}/docker-ubuntu-sshd/README.md (100%) rename server/docker/{ => containers}/docker-ubuntu-sshd/scripts/start (100%) create mode 100644 server/docker/docker.go diff --git a/go.mod b/go.mod index 436812b..8f6702e 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/christophwitzko/go-curl v0.0.0-20171216141518-4203158d6acb github.com/containerd/containerd v1.4.3 // indirect github.com/docker/distribution v2.7.1+incompatible // indirect - github.com/docker/docker v20.10.2+incompatible + github.com/docker/docker v20.10.2+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/fsouza/go-dockerclient v1.7.0 // indirect diff --git a/server/docker/containers/README b/server/docker/containers/README new file mode 100644 index 0000000..a5ada78 --- /dev/null +++ b/server/docker/containers/README @@ -0,0 +1,7 @@ +Containers +=========== + +Structure + |_ Containers + |_ (To ensure the name is the same as the tag name) + |_ DockerFile \ No newline at end of file diff --git a/server/docker/docker-ubuntu-sshd/Dockerfile b/server/docker/containers/docker-ubuntu-sshd/Dockerfile similarity index 100% rename from server/docker/docker-ubuntu-sshd/Dockerfile rename to server/docker/containers/docker-ubuntu-sshd/Dockerfile diff --git a/server/docker/docker-ubuntu-sshd/README.md b/server/docker/containers/docker-ubuntu-sshd/README.md similarity index 100% rename from server/docker/docker-ubuntu-sshd/README.md rename to server/docker/containers/docker-ubuntu-sshd/README.md diff --git a/server/docker/docker-ubuntu-sshd/scripts/start b/server/docker/containers/docker-ubuntu-sshd/scripts/start similarity index 100% rename from server/docker/docker-ubuntu-sshd/scripts/start rename to server/docker/containers/docker-ubuntu-sshd/scripts/start diff --git a/server/docker/docker.go b/server/docker/docker.go new file mode 100644 index 0000000..92a37cb --- /dev/null +++ b/server/docker/docker.go @@ -0,0 +1,8 @@ +package docker + +import ( +) + +func BuildContainer() string{ + return "test" +} \ No newline at end of file diff --git a/server/server.go b/server/server.go index bf38c5b..d840bb5 100644 --- a/server/server.go +++ b/server/server.go @@ -3,6 +3,7 @@ package server import ( "github.com/gin-gonic/gin" "net/http" + docker "git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker" ) func Server() { @@ -14,7 +15,7 @@ func Server() { }) r.GET("/create_vm", func(c *gin.Context) { - c.JSON(http.StatusOK, ServerInfo()) + c.JSON(http.StatusOK, docker.BuildContainer()) }) // Port running on