Use same directories inside the container as kube does.
diff --git a/pkg/cmd/util_commands.go b/pkg/cmd/util_commands.go
index 0b82c4c..c047c85 100644
--- a/pkg/cmd/util_commands.go
+++ b/pkg/cmd/util_commands.go
@@ -49,7 +49,7 @@
return routes
}
-func assembleClasspatchArgValue(properties []string, dependencies []string, routes []string) string {
+func assembleClasspathArgValue(properties []string, dependencies []string, routes []string) string {
classpathContents := []string{}
classpathContents = append(classpathContents, properties...)
classpathContents = append(classpathContents, routes...)
@@ -59,7 +59,7 @@
func assembleIntegrationRunCommand(properties []string, dependencies []string, routes []string, propertiesDir string) *exec.Cmd {
// Create classpath value.
- classpathValue := assembleClasspatchArgValue(properties, dependencies, routes)
+ classpathValue := assembleClasspathArgValue(properties, dependencies, routes)
// Create java command that runs the integration.
javaCmd := "java"
diff --git a/pkg/util/docker/docker.go b/pkg/util/docker/docker.go
index 867c446..90ce1f3 100644
--- a/pkg/util/docker/docker.go
+++ b/pkg/util/docker/docker.go
@@ -57,13 +57,10 @@
// Create container workspace directory.
dockerFile = append(dockerFile, RUNMakeDir(GetContainerWorkspaceDir()))
- // Set workspace directory.
- dockerFile = append(dockerFile, WORKDIR(GetContainerWorkspaceDir()))
-
// Copy files from local directory to container directories.
- dockerFile = append(dockerFile, COPY(util.DefaultRoutesDirectoryName, util.DefaultRoutesDirectoryName))
- dockerFile = append(dockerFile, COPY(util.DefaultPropertiesDirectoryName, util.DefaultPropertiesDirectoryName))
- dockerFile = append(dockerFile, COPY(util.DefaultDependenciesDirectoryName, util.DefaultDependenciesDirectoryName))
+ dockerFile = append(dockerFile, COPY(util.DefaultRoutesDirectoryName, GetContainerRoutesDir()))
+ dockerFile = append(dockerFile, COPY(util.DefaultPropertiesDirectoryName, GetContainerPropertiesDir()))
+ dockerFile = append(dockerFile, COPY(util.DefaultDependenciesDirectoryName, GetContainerDependenciesDir()))
// All Env variables the command requires need to be set in the container.
for _, keyValue := range integrationRunCmd.Env {
@@ -119,17 +116,17 @@
// GetContainerPropertiesDir -- directory inside the container where all the integration property files are copied.
func GetContainerPropertiesDir() string {
- return GetContainerWorkspaceDir() + containerFileSeparator + util.DefaultPropertiesDirectoryName
+ return util.ContainerPropertiesDirectory
}
// GetContainerDependenciesDir -- directory inside the container where all the integration dependencies are copied.
func GetContainerDependenciesDir() string {
- return GetContainerWorkspaceDir() + containerFileSeparator + util.DefaultDependenciesDirectoryName
+ return util.ContainerDependenciesDirectory
}
// GetContainerRoutesDir -- directory inside the container where all the integration routes are copied.
func GetContainerRoutesDir() string {
- return GetContainerWorkspaceDir() + containerFileSeparator + util.DefaultRoutesDirectoryName
+ return util.ContainerRoutesDirectory
}
// ContainerizeFilePaths -- make paths valid container paths given a valid container directory in newDir.
diff --git a/pkg/util/util.go b/pkg/util/util.go
index 49c5bac..07d7d37 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -53,6 +53,18 @@
// DefaultWorkingDirectoryName --
const DefaultWorkingDirectoryName = "workspace"
+// ContainerDependenciesDirectory --
+var ContainerDependenciesDirectory = "/deployments/dependencies"
+
+// ContainerPropertiesDirectory --
+var ContainerPropertiesDirectory = "/etc/camel/conf.d"
+
+// ContainerRoutesDirectory --
+var ContainerRoutesDirectory = "/etc/camel/sources"
+
+// ContainerResourcesDirectory --
+var ContainerResourcesDirectory = "/etc/camel/resources"
+
// StringSliceJoin --
func StringSliceJoin(slices ...[]string) []string {
size := 0
