From 33cd18e9d9565a30154bcab0895ea012793b9516 Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Tue, 20 Sep 2022 19:20:54 +0200 Subject: [PATCH] internal/component: Rework resource paths --- internal/component/ssh/ssh.go | 4 ++-- internal/component/ssh/{stack => ssh}/docker-compose.yml | 0 internal/component/triplestore/triplestore.go | 4 ++-- .../triplestore/{stack => triplestore}/.dockerignore | 0 .../component/triplestore/{stack => triplestore}/Dockerfile | 0 .../triplestore/{stack => triplestore}/docker-compose.yml | 0 .../triplestore/{stack => triplestore}/entrypoint.sh | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename internal/component/ssh/{stack => ssh}/docker-compose.yml (100%) rename internal/component/triplestore/{stack => triplestore}/.dockerignore (100%) rename internal/component/triplestore/{stack => triplestore}/Dockerfile (100%) rename internal/component/triplestore/{stack => triplestore}/docker-compose.yml (100%) rename internal/component/triplestore/{stack => triplestore}/entrypoint.sh (100%) diff --git a/internal/component/ssh/ssh.go b/internal/component/ssh/ssh.go index 9edbb27..e0ab14a 100644 --- a/internal/component/ssh/ssh.go +++ b/internal/component/ssh/ssh.go @@ -15,12 +15,12 @@ func (SSH) Name() string { return "ssh" } -//go:embed all:stack +//go:embed all:ssh var resources embed.FS func (ssh SSH) Stack(env environment.Environment) component.StackWithResources { return ssh.ComponentBase.MakeStack(env, component.StackWithResources{ Resources: resources, - ContextPath: "stack", + ContextPath: "ssh", }) } diff --git a/internal/component/ssh/stack/docker-compose.yml b/internal/component/ssh/ssh/docker-compose.yml similarity index 100% rename from internal/component/ssh/stack/docker-compose.yml rename to internal/component/ssh/ssh/docker-compose.yml diff --git a/internal/component/triplestore/triplestore.go b/internal/component/triplestore/triplestore.go index 023ecfd..2538601 100644 --- a/internal/component/triplestore/triplestore.go +++ b/internal/component/triplestore/triplestore.go @@ -23,13 +23,13 @@ func (Triplestore) Name() string { return "triplestore" } -//go:embed all:stack +//go:embed all:triplestore var resources embed.FS func (ts Triplestore) Stack(env environment.Environment) component.StackWithResources { return ts.ComponentBase.MakeStack(env, component.StackWithResources{ Resources: resources, - ContextPath: "stack", + ContextPath: "triplestore", CopyContextFiles: []string{"graphdb.zip"}, // TODO: Move into constant? diff --git a/internal/component/triplestore/stack/.dockerignore b/internal/component/triplestore/triplestore/.dockerignore similarity index 100% rename from internal/component/triplestore/stack/.dockerignore rename to internal/component/triplestore/triplestore/.dockerignore diff --git a/internal/component/triplestore/stack/Dockerfile b/internal/component/triplestore/triplestore/Dockerfile similarity index 100% rename from internal/component/triplestore/stack/Dockerfile rename to internal/component/triplestore/triplestore/Dockerfile diff --git a/internal/component/triplestore/stack/docker-compose.yml b/internal/component/triplestore/triplestore/docker-compose.yml similarity index 100% rename from internal/component/triplestore/stack/docker-compose.yml rename to internal/component/triplestore/triplestore/docker-compose.yml diff --git a/internal/component/triplestore/stack/entrypoint.sh b/internal/component/triplestore/triplestore/entrypoint.sh similarity index 100% rename from internal/component/triplestore/stack/entrypoint.sh rename to internal/component/triplestore/triplestore/entrypoint.sh