Skip to content

Commit

Permalink
Use same directories inside the container as kube does.
Browse files Browse the repository at this point in the history
  • Loading branch information
doru1004 committed Dec 2, 2020
1 parent aea84aa commit 43f8d6c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
4 changes: 2 additions & 2 deletions pkg/cmd/util_commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func formatRoutes(files []string) []string {
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...)
Expand All @@ -59,7 +59,7 @@ func assembleClasspatchArgValue(properties []string, dependencies []string, rout

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"
Expand Down
15 changes: 6 additions & 9 deletions pkg/util/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,10 @@ func CreateIntegrationImageDockerFile(integrationRunCmd *exec.Cmd) error {
// 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 {
Expand Down Expand Up @@ -119,17 +116,17 @@ func GetContainerWorkspaceDir() string {

// 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.
Expand Down
12 changes: 12 additions & 0 deletions pkg/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@ const DefaultRoutesDirectoryName = "routes"
// 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
Expand Down

0 comments on commit 43f8d6c

Please sign in to comment.