diff --git a/amps/ags/rm-community/rm-community-repo/Dockerfile b/amps/ags/rm-community/rm-community-repo/Dockerfile
index e00c30b734..bdb137fdbc 100644
--- a/amps/ags/rm-community/rm-community-repo/Dockerfile
+++ b/amps/ags/rm-community/rm-community-repo/Dockerfile
@@ -1,4 +1,3 @@
-ARG BASE_IMAGE
# BUILD STAGE AGS
FROM debian:11-slim AS AGSBUILDER
@@ -13,7 +12,7 @@ RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
chmod -R g-w,o= /build
# ACTUAL IMAGE
-FROM ${BASE_IMAGE}
+FROM alfresco/alfresco-community-repo-base:${image.tag}
# Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
# The access will be fixed after all operations are done.
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index a9e0d49c85..3fcb8196be 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -15,8 +15,6 @@
${project.build.directory}/${project.build.finalName}-war
alfresco/alfresco-governance-repository-community-base
- alfresco/alfresco-community-repo-base
- ${project.parent.parent.parent.parent.basedir}/scripts
@@ -539,43 +537,9 @@
-
- build-docker-images
-
-
-
-
- io.fabric8
- docker-maven-plugin
-
-
-
- ${image.name}:${image.tag}
-
-
- ${base.image}:${image.tag}
-
- ${project.basedir}
-
-
-
-
-
-
- build-image
- package
-
- build
-
-
-
-
-
-
-
-
- build-multiarch-docker-images
+ build-docker-images
+
@@ -584,51 +548,20 @@
- ${local.registry}/${image.name}:${image.tag}
-
-
- ${builder.name}
-
-
- ${local.registry}/${base.image}:${image.tag}
-
-
+ ${image.name}:${image.tag}
- build-push-image
- install
+ build-image
+ package
build
- push
-
- exec-maven-plugin
- org.codehaus.mojo
-
-
- prepare-buildx
- generate-sources
-
- exec
-
-
- ${scripts.directory}/prepare_buildx.sh
-
- ${builder.name}
- ${image.registry}
- ${image.name}
- ${image.tag}
-
-
-
-
-
@@ -645,27 +578,12 @@
- ${image.registry}/${image.name}:${image.tag}
-
-
- ${builder.name}
-
-
- ${local.registry}/${base.image}:${image.tag}
-
-
+ ${image.name}:${image.tag}
+ ${image.registry}
${image.name}:${image.tag}
-
-
- ${builder.name}
-
-
- ${local.registry}/${base.image}:${image.tag}
-
-
@@ -680,28 +598,6 @@
-
- exec-maven-plugin
- org.codehaus.mojo
-
-
- prepare-buildx
- generate-sources
-
- exec
-
-
- ${scripts.directory}/prepare_buildx.sh
-
- ${builder.name}
- ${image.registry}
- ${image.name}
- ${image.tag}
-
-
-
-
-
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 933079e46b..7c85f85a27 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -12,7 +12,6 @@
alfresco/alfresco-community-repo-base
- ${project.parent.parent.basedir}/scripts
@@ -136,7 +135,7 @@
io.fabric8
docker-maven-plugin
-
+
${image.name}:${image.tag}
@@ -157,62 +156,6 @@
-
- build-multiarch-docker-images
-
-
-
- io.fabric8
- docker-maven-plugin
-
-
-
- ${local.registry}/${image.name}:${image.tag}
-
-
- ${builder.name}
-
-
-
-
-
-
-
- build-push-image
- install
-
- build
- push
-
-
-
-
-
- exec-maven-plugin
- org.codehaus.mojo
-
-
- prepare-buildx
- generate-sources
-
- exec
-
-
- ${scripts.directory}/prepare_buildx.sh
-
- ${builder.name}
- ${image.registry}
- ${image.name}
- ${image.tag}
-
-
-
-
-
-
-
-
-
push-docker-images
@@ -225,7 +168,8 @@
- ${image.registry}/${image.name}:${image.tag}
+ ${image.name}:${image.tag}
+ ${image.registry}
diff --git a/pom.xml b/pom.xml
index 8b73572379..59ff61e935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,6 @@
local
latest
quay.io
- entitled-builder
- 127.0.0.1:5000
11
${java.version}
@@ -919,21 +917,6 @@
io.fabric8
docker-maven-plugin
0.42.0
-
-
-
-
-
-
- linux/amd64
- linux/arm64
-
-
- ${project.basedir}
-
-
-
-
maven-surefire-plugin
diff --git a/scripts/prepare_buildx.sh b/scripts/prepare_buildx.sh
deleted file mode 100755
index 377b916371..0000000000
--- a/scripts/prepare_buildx.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-BUILDER_NAME="${1}"
-TARGET_REGISTRY="${2}"
-TARGET_IMAGE="${3}"
-IMAGE_TAG="${4}"
-
-#Create a `docker-container` builder with host networking and required flags (quay.io)
-docker --config target/docker/"${TARGET_REGISTRY}"/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
-buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
---buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
-
-#Create a `docker-container` builder with host networking and required flags (docker.io)
-docker --config target/docker/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
-buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
---buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
-
-#Create a `docker-container` builder with host networking and required flags (local registry)
-docker --config target/docker/127.0.0.1/5000/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
-buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
---buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
\ No newline at end of file