feat: add hooks for docker image generation

FriendsOfShopware · Jan 24, 2024 · d0a198d · d0a198d
1 parent adb75d3
commit d0a198d
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1 deletion.
diff --git a/cmd/project/docker_build.go b/cmd/project/docker_build.go
@@ -106,11 +106,29 @@ func configureDockerfileTemplate(ctx context.Context, shopCfg *shop.Config) (map
 		}
 	}
 
+	hooks := make(map[string]string)
+	if shopCfg.Docker.Hooks.PreUpdate != "" {
+		hooks["pre_update"] = shopCfg.Docker.Hooks.PreUpdate
+	}
+
+	if shopCfg.Docker.Hooks.PostUpdate != "" {
+		hooks["post_update"] = shopCfg.Docker.Hooks.PostUpdate
+	}
+
+	if shopCfg.Docker.Hooks.PreInstall != "" {
+		hooks["pre_install"] = shopCfg.Docker.Hooks.PreInstall
+	}
+
+	if shopCfg.Docker.Hooks.PostInstall != "" {
+		hooks["post_install"] = shopCfg.Docker.Hooks.PostInstall
+	}
+
 	templateVars := map[string]interface{}{
 		"PHP":          shopCfg.Docker.PHP,
 		"ExcludePaths": shopCfg.Docker.ExcludePaths,
 		"BuildEnv":     strings.Join(buildEnvironments, " "),
 		"RunEnv":       strings.Join(runEnvironments, " "),
+		"Hooks":        hooks,
 	}
 
 	return templateVars, nil

diff --git a/cmd/project/templates/Dockerfile.tpl b/cmd/project/templates/Dockerfile.tpl
@@ -45,4 +45,10 @@ FROM base-extended
 ENV {{ .RunEnv }}
 {{- end }}
 
+{{- range $key, $value := .Hooks }}
+COPY --chmod=555 <<EOF /usr/local/shopware/{{ $key }}.d/01-generated.sh
+{{ $value }}
+EOF
+{{- end }}
+
 COPY --from=build --chown=www-data --link /src /var/www/html
diff --git a/shop/config.go b/shop/config.go
@@ -39,8 +39,16 @@ type ConfigDockerPHP struct {
 
 type ConfigDocker struct {
 	Environment  []ConfigDockerEnvironmentVariable `yaml:"env,omitempty"`
-	PHP          ConfigDockerPHP                   `yaml:"php"`
+	PHP          ConfigDockerPHP                   `yaml:"php,omitempty"`
 	ExcludePaths []string                          `yaml:"exclude_paths,omitempty"`
+	Hooks        ConfigDockerHooks                 `yaml:"hooks,omitempty"`
+}
+
+type ConfigDockerHooks struct {
+	PreUpdate   string `yaml:"pre_update,omitempty"`
+	PostUpdate  string `yaml:"post_update,omitempty"`
+	PreInstall  string `yaml:"pre_install,omitempty"`
+	PostInstall string `yaml:"post_install,omitempty"`
 }
 
 type ConfigDockerEnvironmentVariable struct {

diff --git a/shop/shopware-project-schema.json b/shop/shopware-project-schema.json
@@ -39,6 +39,28 @@
                     "type": "array",
                     "items": {"type": "string"}
                 },
+                "hooks": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "pre_update": {
+                            "type": "array",
+                            "items": {"type": "string"}
+                        },
+                        "post_update": {
+                            "type": "array",
+                            "items": {"type": "string"}
+                        },
+                        "pre_install": {
+                            "type": "array",
+                            "items": {"type": "string"}
+                        },
+                        "post_install": {
+                            "type": "array",
+                            "items": {"type": "string"}
+                        }
+                    }
+                },
                 "env": {
                     "type": "array",
                     "items": {