Skip to content

Commit a0ce3cd

Browse files
committed
Change default mount destination to /var/www/html
1 parent c9f6197 commit a0ce3cd

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

cmd/wodby/ci/build/build.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ var Cmd = &cobra.Command{
113113
if config.DataContainer != "" {
114114
fmt.Println("Synchronizing data container")
115115

116-
from := fmt.Sprintf("%s:/mnt/codebase", config.DataContainer)
116+
from := fmt.Sprintf("%s:/var/www/html", config.DataContainer)
117117
to := fmt.Sprintf("/tmp/wodby-build-%s", config.DataContainer)
118118
_, err := exec.Command("docker", "cp", from, to).CombinedOutput()
119119
if err != nil {
@@ -166,7 +166,7 @@ var Cmd = &cobra.Command{
166166
}
167167

168168
// Replace default image user in dockerfile template.
169-
defaultUser, err := dockerClient.GetDefaultImageUser(service.Image)
169+
defaultUser, err := dockerClient.GetImageDefaultUser(service.Image)
170170

171171
if err != nil {
172172
return err

cmd/wodby/ci/initialize/initialize.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ var Cmd = &cobra.Command{
122122

123123
config.DataContainer = uuid.New()
124124

125-
_, err := exec.Command("docker", "create", "--volume=/mnt/codebase", fmt.Sprintf("--name=%s", config.DataContainer), "wodby/alpine:3.7-2.0.0", "/bin/true").CombinedOutput()
125+
_, err := exec.Command("docker", "create", "--volume=/var/www/html", fmt.Sprintf("--name=%s", config.DataContainer), "wodby/alpine:3.7-2.0.0", "/bin/true").CombinedOutput()
126126
if err != nil {
127127
return err
128128
}
129129

130-
_, err = exec.Command("docker", "cp", fmt.Sprintf("%s/.", config.Context), fmt.Sprintf("%s:/mnt/codebase", config.DataContainer)).CombinedOutput()
130+
_, err = exec.Command("docker", "cp", fmt.Sprintf("%s/.", config.Context), fmt.Sprintf("%s:/var/www/html", config.DataContainer)).CombinedOutput()
131131
if err != nil {
132132
return err
133133
}
@@ -150,7 +150,7 @@ var Cmd = &cobra.Command{
150150
// Fixing permissions for managed stacks.
151151
if !opts.skipPermFix && !config.Stack.Custom {
152152
service := config.Stack.Services[config.Stack.Default]
153-
defaultUser, err := dockerClient.GetDefaultImageUser(service.Image)
153+
defaultUser, err := dockerClient.GetImageDefaultUser(service.Image)
154154

155155
if err != nil {
156156
return err
@@ -167,9 +167,9 @@ var Cmd = &cobra.Command{
167167
if config.DataContainer != "" {
168168
runConfig.VolumesFrom = []string{config.DataContainer}
169169
} else {
170-
runConfig.Volumes = append(runConfig.Volumes, fmt.Sprintf("%s:/mnt/codebase", config.Context))
170+
runConfig.Volumes = append(runConfig.Volumes, fmt.Sprintf("%s:/var/www/html", config.Context))
171171
}
172-
runConfig.WorkDir = "/mnt/codebase/"
172+
runConfig.WorkDir = "/var/www/html/"
173173

174174
args := []string{"chown", "-R", fmt.Sprintf("%s:%s", defaultUser, defaultUser), "."}
175175
err := dockerClient.Run(args, runConfig)
@@ -199,9 +199,9 @@ var Cmd = &cobra.Command{
199199
if config.DataContainer != "" {
200200
runConfig.VolumesFrom = []string{config.DataContainer}
201201
} else {
202-
runConfig.Volumes = append(runConfig.Volumes, fmt.Sprintf("%s:/mnt/codebase", config.Context))
202+
runConfig.Volumes = append(runConfig.Volumes, fmt.Sprintf("%s:/var/www/html", config.Context))
203203
}
204-
runConfig.WorkDir = "/mnt/codebase/"
204+
runConfig.WorkDir = "/var/www/html/"
205205

206206
err := dockerClient.Run(strings.Split(config.Stack.Init.Command, " "), runConfig)
207207

cmd/wodby/ci/run/run.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ var Cmd = &cobra.Command{
9797
if config.DataContainer != "" {
9898
runConfig.VolumesFrom = []string{config.DataContainer}
9999
} else {
100-
runConfig.Volumes = append(runConfig.Volumes, fmt.Sprintf("%s:/mnt/codebase", config.Context))
100+
runConfig.Volumes = append(runConfig.Volumes, fmt.Sprintf("%s:/var/www/html", config.Context))
101101
}
102-
runConfig.WorkDir = "/mnt/codebase/" + opts.path
102+
runConfig.WorkDir = "/var/www/html/" + opts.path
103103

104104
err := dockerClient.Run(args, runConfig)
105105

pkg/docker/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (c *Client) Tag(image string, tag string) error {
7979
return cmdStartVerbose(cmd)
8080
}
8181

82-
func (c *Client) GetDefaultImageUser(image string) (string, error) {
82+
func (c *Client) GetImageDefaultUser(image string) (string, error) {
8383
defaultUser := ""
8484

8585
err := c.Pull(image)

0 commit comments

Comments
 (0)