feat: update to engine-ci 0.24.2

Author: fr123k

go.mod

@@ -2,8 +2,10 @@ module github.com/containifyci/java
 
 go 1.25.0
 
+// replace github.com/containifyci/engine-ci => ../engine-ci
+
 require (
-	github.com/containifyci/engine-ci v0.23.0
+	github.com/containifyci/engine-ci v0.24.2
 	github.com/stretchr/testify v1.11.1
 )
 

go.sum

@@ -70,8 +70,8 @@ github.com/containers/psgo v1.9.0 h1:eJ74jzSaCHnWt26OlKZROSyUyRcGDf+gYBdXnxrMW4g
 github.com/containers/psgo v1.9.0/go.mod h1:0YoluUm43Mz2UnBIh1P+6V6NWcbpTL5uRtXyOcH0B5A=
 github.com/containers/storage v1.58.0 h1:Q7SyyCCjqgT3wYNgRNIL8o/wUS92heIj2/cc8Sewvcc=
 github.com/containers/storage v1.58.0/go.mod h1:w7Jl6oG+OpeLGLzlLyOZPkmUso40kjpzgrHUk5tyBlo=
-github.com/containifyci/engine-ci v0.23.0 h1:buMLR+dOqct9vVYx4S35rkyT8iJuzqHJHjH7xO+2iog=
-github.com/containifyci/engine-ci v0.23.0/go.mod h1:SWRTTkF3IADlTwY0w20hCukdeJKOsuS8XmbmoWZE1kw=
+github.com/containifyci/engine-ci v0.24.2 h1:TTiPVgY0F2NR0OHq8xO9H45lhpkZQL2Da5M8Irt5x5k=
+github.com/containifyci/engine-ci v0.24.2/go.mod h1:SWRTTkF3IADlTwY0w20hCukdeJKOsuS8XmbmoWZE1kw=
 github.com/containifyci/engine-ci/protos2 v0.15.2 h1:CjUuYqXt0gAakiUCDWn5JaO+oTesFMeyGj0Vs7A24qc=
 github.com/containifyci/engine-ci/protos2 v0.15.2/go.mod h1:k7k6Zego6VwwYFYHM4LcBR34E6NDxY1OO8lgVQzMpQ0=
 github.com/containifyci/go-self-update v0.2.2 h1:qbactPBL9Ad90bS6v5dIjulNFwqxj/C+IK8ZdFxe9CM=

main.go

@@ -24,15 +24,15 @@ func main() {
 	slog.Info("Version", "version", v)
 
 	arg := cmd.GetBuild()
-	// // cmd.Init(arg)
+
+	bld := cmd.Init(arg[0].Builds[0])
 
 	bs := build.NewBuildSteps(
-		append(maven.Steps(arg[0].Builds[0]),
-			sonarcloud.New(*arg[0].Builds[0]),
-			trivy.New(*arg[0].Builds[0]),
-			github.New(*arg[0].Builds[0]))...,
+		append(maven.Steps(bld),
+			sonarcloud.New(*bld),
+			trivy.New(*bld),
+			github.New(*bld))...,
 	)
-
 	cmd.InitBuildSteps(bs)
 	err := cmd.Execute()
 	if err != nil {

pkg/maven/Dockerfile.maven

@@ -4,7 +4,18 @@ FROM eclipse-temurin:17-jdk-jammy
 # iproute2 needed for the testcontainers to work within a container (DIND)
 RUN apt update && \
   apt -y upgrade && \
-  apt -y install protobuf-compiler iproute2 && \
+  apt -y install protobuf-compiler iproute2 curl tar && \
   apt -y autoremove && \
   apt -y clean && \
   rm -rf /var/lib/apt/lists/*
+
+# Install Maven
+ARG MAVEN_VERSION=3.9.11
+
+RUN curl -fsSL https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+    | tar -xz -C /opt \
+  && mv /opt/apache-maven-${MAVEN_VERSION} /opt/maven \
+  && ln -s /opt/maven/bin/mvn /usr/local/bin/mvn
+
+ENV MAVEN_HOME=/opt/maven \
+    MAVEN_CONFIG=/root/.m2

pkg/maven/Dockerfile.maven_17-jdk-jammy

@@ -8,3 +8,14 @@ RUN apt update && \
   apt -y autoremove && \
   apt -y clean && \
   rm -rf /var/lib/apt/lists/*
+
+# Install Maven
+ARG MAVEN_VERSION=3.9.11
+
+RUN curl -fsSL https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+    | tar -xz -C /opt \
+  && mv /opt/apache-maven-${MAVEN_VERSION} /opt/maven \
+  && ln -s /opt/maven/bin/mvn /usr/local/bin/mvn
+
+ENV MAVEN_HOME=/opt/maven \
+    MAVEN_CONFIG=/root/.m2

pkg/maven/Dockerfile.maven_21-jdk-jammy

@@ -8,3 +8,14 @@ RUN apt update && \
   apt -y autoremove && \
   apt -y clean && \
   rm -rf /var/lib/apt/lists/*
+
+# Install Maven
+ARG MAVEN_VERSION=3.9.11
+
+RUN curl -fsSL https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+    | tar -xz -C /opt \
+  && mv /opt/apache-maven-${MAVEN_VERSION} /opt/maven \
+  && ln -s /opt/maven/bin/mvn /usr/local/bin/mvn
+
+ENV MAVEN_HOME=/opt/maven \
+    MAVEN_CONFIG=/root/.m2

pkg/maven/buildscript.go

@@ -24,13 +24,13 @@ func Script(bs *BuildScript) string {
 func simpleScript(bs *BuildScript) string {
 	return `#!/bin/sh
 set -xe
-./mvnw --batch-mode package
+mvn --batch-mode package
 `
 }
 
 func verboseScript(bs *BuildScript) string {
 	return `#!/bin/sh
 set -xe
-./mvnw --batch-mode package -X
+mvn --batch-mode package -X
 `
 }

pkg/maven/buildscript_test.go

@@ -10,12 +10,12 @@ func TestSimpleScript(t *testing.T) {
 	bs := NewBuildScript(false, "localhost")
 	script := Script(bs)
 
-	assert.Equal(t, "#!/bin/sh\nset -xe\n./mvnw --batch-mode package\n", script)
+	assert.Equal(t, "#!/bin/sh\nset -xe\nmvn --batch-mode package\n", script)
 }
 
 func TestVerboseScript(t *testing.T) {
 	bs := NewBuildScript(true, "localhost")
 	script := Script(bs)
 
-	assert.Equal(t, "#!/bin/sh\nset -xe\n./mvnw --batch-mode package -X\n", script)
+	assert.Equal(t, "#!/bin/sh\nset -xe\nmvn --batch-mode package -X\n", script)
 }

pkg/maven/maven.go

@@ -21,34 +21,41 @@ import (
 )
 
 const (
-	ProdImage     = "registry.access.redhat.com/ubi8/openjdk-%s:latest"
+	ProdImage     = "tomcat:latest"
 	CacheLocation = "/root/.m2/"
 )
 
 //go:embed Dockerfile.*
 var f embed.FS
 
 type MavenContainer struct {
-	App      string
-	File     string
-	Folder   string
-	Image    string
-	ImageTag string
-	Platform types.Platform
+	App       string
+	File      u.SrcFile
+	Folder    string
+	Image     string
+	ImageTag  string
+	Platform  types.Platform
+	ProdImage string
 
 	Version string
 	*container.Container
 }
 
 func New(build *container.Build, version string) *MavenContainer {
+	prodImage := build.Custom.String("image")
+	if prodImage == "" {
+		prodImage = ProdImage
+	}
 	return &MavenContainer{
 		App:       build.App,
 		Container: container.New(*build),
 		Image:     build.Image,
 		Folder:    build.Folder,
+		File:      u.SrcFile(build.File),
 		ImageTag:  build.ImageTag,
 		Platform:  build.Platform,
 		Version:   version,
+		ProdImage: prodImage,
 	}
 }
 
@@ -80,11 +87,14 @@ func CacheFolder() string {
 }
 
 func (c *MavenContainer) Pull() error {
-	return c.Container.Pull(fmt.Sprintf(ProdImage, c.Version))
+
+	// return c.Container.Pull(fmt.Sprintf(ProdImage, c.Version))
+	return c.Container.Pull(c.ProdImage)
 }
 
 func (c *MavenContainer) Images() []string {
-	return []string{c.MavenImage(), fmt.Sprintf(ProdImage, c.Version)}
+	// return []string{c.MavenImage(), fmt.Sprintf(ProdImage, c.Version)}
+	return []string{c.MavenImage(), c.ProdImage}
 }
 
 // TODO: provide a shorter checksum
@@ -254,15 +264,19 @@ func NewProd(arg *container.Build, version string) build.Build {
 
 func (c *MavenContainer) Prod() error {
 	opts := types.ContainerConfig{}
-	opts.Image = fmt.Sprintf(ProdImage, c.Version)
-	opts.Env = []string{
-		"JAVA_OPTS=-javaagent:/deployments/dd-java-agent.jar -Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager",
-		"JAVA_APP_JAR=/deployments/quarkus-run.jar",
-	}
+	opts.Image = c.ProdImage
+	// opts.Image = fmt.Sprintf(ProdImage, c.Version)
+	// opts.Env = []string{
+	// 	"JAVA_OPTS=-javaagent:/deployments/dd-java-agent.jar -Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager",
+	// 	"JAVA_APP_JAR=/deployments/quarkus-run.jar",
+	// }
+	// opts.Env = []string{
+	// 	"JAVA_OPTS=-javaagent:/deployments/dd-java-agent.jar -Djava.util.logging.manager=org.jboss.logmanager.LogManager",
+	// }
 	opts.Platform = types.AutoPlatform
 	opts.Cmd = []string{"sleep", "300"}
-	opts.User = "185"
-	opts.WorkingDir = "/src"
+	// opts.User = "185"
+	// opts.WorkingDir = "/src"
 
 	err := c.Create(opts)
 	if err != nil {
@@ -276,19 +290,19 @@ func (c *MavenContainer) Prod() error {
 		os.Exit(1)
 	}
 
-	err = c.Exec("curl", "-Lo", "/deployments/dd-java-agent.jar", "https://dtdg.co/latest-java-tracer")
-	if err != nil {
-		slog.Error("Failed to execute command: %s", "error", err)
-		os.Exit(1)
-	}
+	// err = c.Exec("curl", "-Lo", "/deployments/dd-java-agent.jar", "https://dtdg.co/latest-java-tracer")
+	// if err != nil {
+	// 	slog.Error("Failed to execute command: %s", "error", err)
+	// 	os.Exit(1)
+	// }
 
-	err = c.CopyDirectoryTo(c.Folder, "/deployments")
+	err = c.CopyFileTo(c.File.Host(), "/usr/local/tomcat/webapps/jpetstore.war")
 	if err != nil {
-		slog.Error("Failed to copy directory to container: %s", "error", err)
+		slog.Error("Failed to copy file to container", "error", err, "file", c.File)
 		os.Exit(1)
 	}
 
-	imageId, err := c.Commit(fmt.Sprintf("%s:%s", c.Image, c.ImageTag), "Created from container", "CMD [\"/usr/local/s2i/run\"]", "USER 185")
+	imageId, err := c.Commit(fmt.Sprintf("%s:%s", c.Image, c.ImageTag), "Created from container", "CMD [\"catalina.sh\", \"run\"]")
 	if err != nil {
 		slog.Error("Failed to commit container: %s", "error", err)
 		os.Exit(1)

pkg/maven/maven_test.go

@@ -136,7 +136,7 @@ func TestBuildDarwinPodman(t *testing.T) {
 
 		assert.Equal(t, "started", v.GetContainerByImage(img).State)
 		assert.Equal(t, []string{"sh", "/tmp/script.sh"}, v.GetContainerByImage(img).Opts.Cmd)
-		assert.Equal(t, "#!/bin/sh\nset -xe\n./mvnw --batch-mode package\n", v.GetContainerByImage(img).Opts.Script)
+		assert.Equal(t, "#!/bin/sh\nset -xe\nmvn --batch-mode package\n", v.GetContainerByImage(img).Opts.Script)
 		assert.Equal(t, "/src", v.GetContainerByImage(img).Opts.WorkingDir)
 		assert.Equal(t, "containifyci/maven-3-eclipse-temurin-17-alpine:214f702cd3dee211717ca17936aca88df6913e1db40f822ef9918e4369ea927d", v.GetContainerByImage(img).Opts.Image)
 		assert.Equal(t, int64(4073741824), v.GetContainerByImage(img).Opts.Memory)