This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6d38dcf3f Fix for removing plugins from the Docker Image
(CONNECTORS-1783) and GitHub workflow
6d38dcf3f is described below
commit 6d38dcf3fa1910b18ba2916d3915084cfb2d2ec8
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Wed Mar 18 12:17:16 2026 +0100
Fix for removing plugins from the Docker Image (CONNECTORS-1783) and GitHub
workflow
---
.github/workflows/create-docker-image.yml | 2 +-
.github/workflows/create-release-candidate.yml | 19 +++++-----
.../workflows/publish-release-candidate-svn.yml | 7 ----
Dockerfile | 38 +++++++++-----------
src/main/docker/JDK-21/Dockerfile | 41 ++++++++++------------
5 files changed, 46 insertions(+), 61 deletions(-)
diff --git a/.github/workflows/create-docker-image.yml
b/.github/workflows/create-docker-image.yml
index f6076ff76..cb0f981c7 100644
--- a/.github/workflows/create-docker-image.yml
+++ b/.github/workflows/create-docker-image.yml
@@ -103,7 +103,7 @@ jobs:
- name: Fix Nuxeo URL
run: |
- sed -i
's/http\:\/\/maven.nuxeo.com\/nexus\/content\/repositories\/public-releases/https\:\/\/packages.nuxeo.com\/repository\/maven-public-archives/g'
build.xml
+ sed -i -e
's|http\:\/\/maven.nuxeo.com\/nexus\/content\/repositories\/public-releases|https\:\/\/packages.nuxeo.com\/repository\/maven-public-archives|g'
build.xml
- name: Ant Build
run: ant make-core-deps make-deps image
diff --git a/.github/workflows/create-release-candidate.yml
b/.github/workflows/create-release-candidate.yml
index 476c39d16..efa0aaa2d 100644
--- a/.github/workflows/create-release-candidate.yml
+++ b/.github/workflows/create-release-candidate.yml
@@ -88,7 +88,7 @@ jobs:
run: mvn versions:set -DnewVersion=${{
steps.mavenProjectVersion.outputs.version }} -DremoveSnapshot
-DgenerateBackupPoms=false
- name: Update Ant script with the new RC version
- run: sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{
steps.releaseVersion.outputs.version }}/g' build.xml;
+ run: sed -i -e 's|${{ steps.releaseVersion.outputs.version }}-dev|${{
steps.releaseVersion.outputs.version }}|g' build.xml;
- name: Update CHANGES.txt
run: sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/Release
${{ steps.releaseVersion.outputs.version }}/g' CHANGES.txt;
@@ -101,11 +101,14 @@ jobs:
- name: Update MCF version in the properties.xml files
run: |
- sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{
steps.releaseVersion.outputs.version }}/g' dist/example/properties.xml;
- sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{
steps.releaseVersion.outputs.version }}/g'
dist/example-proprietary/properties.xml;
- sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{
steps.releaseVersion.outputs.version }}/g'
dist/multiprocess-file-example/properties.xml;
- sed -i 's/${{ steps.releaseVersion.outputs.version }}-dev/${{
steps.releaseVersion.outputs.version }}/g'
dist/multiprocess-file-example-proprietary/properties.xml;
+ sed -i -e 's|${{ steps.releaseVersion.outputs.version }}-dev|${{
steps.releaseVersion.outputs.version }}|g' dist/example/properties.xml;
+ sed -i -e 's|${{ steps.releaseVersion.outputs.version }}-dev|${{
steps.releaseVersion.outputs.version }}|g'
dist/example-proprietary/properties.xml;
+ sed -i -e 's|${{ steps.releaseVersion.outputs.version }}-dev|${{
steps.releaseVersion.outputs.version }}|g'
dist/multiprocess-file-example/properties.xml;
+ sed -i -e 's|${{ steps.releaseVersion.outputs.version }}-dev|${{
steps.releaseVersion.outputs.version }}|g'
dist/multiprocess-file-example-proprietary/properties.xml;
+ - name: Update Docker Image tag
+ run: sed -i 's/SNAPSHOT/${{ github.event.inputs.releasecandidatetag
}}/g' Dockerfile;
+
- name: RAT licence checks
run: mvn -pl . apache-rat:check
@@ -118,7 +121,8 @@ jobs:
- name: Commit and Push
run: |
find . -name 'pom.xml' -exec git add {} \;
- git add CHANGES.txt build.xml
+ git add CHANGES.txt build.xml Dockerfile
+ git add dist/example/properties.xml
dist/example-proprietary/properties.xml
dist/multiprocess-file-example/properties.xml
dist/multiprocess-file-example-proprietary/properties.xml
git commit -am "Create ${{ github.event.inputs.releasecandidatetag
}} tag for MCF ${{ steps.mavenProjectVersion.outputs.version }}"
git push
@@ -302,9 +306,6 @@ jobs:
org.opencontainers.image.version=${{ steps.branchTag.outputs.tag }}
org.opencontainers.image.licenses=Apache-2.0
- - name: Update Docker Image tag
- run: sed -i 's/SNAPSHOT/${{ github.event.inputs.releasecandidatetag
}}/g' Dockerfile;
-
- name: Build and push ManifoldCF Docker Image
uses: docker/[email protected]
with:
diff --git a/.github/workflows/publish-release-candidate-svn.yml
b/.github/workflows/publish-release-candidate-svn.yml
index 3a1f2a5cf..65eba555e 100644
--- a/.github/workflows/publish-release-candidate-svn.yml
+++ b/.github/workflows/publish-release-candidate-svn.yml
@@ -135,13 +135,6 @@ jobs:
gpg --local-user "${{steps.import_gpg.outputs.name}}" --armor
--output
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.zip.asc
--detach-sig
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.zip
gpg --local-user "${{steps.import_gpg.outputs.name}}" --armor
--output
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.tar.gz.asc
--detach-sig
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.tar.gz
- gpg --print-md MD5
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.zip >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.zip.md5
- gpg --print-md MD5
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.tar.gz >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.tar.gz.md5
- gpg --print-md MD5
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-lib.zip >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-lib.zip.md5
- gpg --print-md MD5
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-lib.tar.gz >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-lib.tar.gz.md5
- gpg --print-md MD5
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.zip >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.zip.md5
- gpg --print-md MD5
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.tar.gz >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-bin.tar.gz.md5
-
gpg --print-md SHA512
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.zip >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.zip.sha512
gpg --print-md SHA512
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.tar.gz >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-src.tar.gz.sha512
gpg --print-md SHA512
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-lib.zip >
apache-manifoldcf-${{steps.standardMavenVersion.outputs.version}}-lib.zip.sha512
diff --git a/Dockerfile b/Dockerfile
index 504a6206c..aa84730f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,28 +30,24 @@ ARG MCF_PORT=8345
RUN apt-get update && apt-get install -y iputils-ping && \
apt-get install -y dnsutils
-COPY dist/. ${MCF_HOME}/
+#Below the specific COPY instructions to configure a distribution without
propprietary artifacts and plugins
-#Below the specific COPY instructions to configure a distribution without
propprietary artifacts
-#COPY dist/connector-build.xml ${MCF_HOME}/connector-build.xml
-#COPY dist/connectors.xml ${MCF_HOME}/connectors.xml
-#COPY dist/DEPENDENCIES.txt ${MCF_HOME}/DEPENDENCIES.txt
-#COPY dist/LICENSE.txt ${MCF_HOME}/LICENSE.txt
-#COPY dist/README.txt ${MCF_HOME}/README.txt
-
-#COPY dist/connector-common-lib ${MCF_HOME}/connector-common-lib
-#COPY dist/connector-lib ${MCF_HOME}/connector-lib
-#COPY dist/doc ${MCF_HOME}/doc
-#COPY dist/example ${MCF_HOME}/example
-#COPY dist/file-resources ${MCF_HOME}/file-resources
-#COPY dist/lib ${MCF_HOME}/lib
-#COPY dist/multiprocess-file-example ${MCF_HOME}/multiprocess-file-example
-#COPY dist/multiprocess-zk-example ${MCF_HOME}/multiprocess-zk-example
-#COPY dist/obfuscation-utility ${MCF_HOME}/obfuscation-utility
-#COPY dist/plugins/solr ${MCF_HOME}/plugins/solr
-#COPY dist/script-engine ${MCF_HOME}/script-engine
-#COPY dist/test-lib ${MCF_HOME}/test-lib
-#COPY dist/web/war ${MCF_HOME}/web/war
+COPY dist/connector-common-lib/ ${MCF_HOME}/connector-common-lib/
+COPY dist/connector-lib/ ${MCF_HOME}/connector-lib/
+COPY dist/connector-lib-proprietary/ ${MCF_HOME}/connector-lib-proprietary/
+COPY dist/example/ ${MCF_HOME}/example/
+COPY dist/file-resources/ ${MCF_HOME}/file-resources/
+COPY dist/lib/ ${MCF_HOME}/lib/
+COPY dist/multiprocess-file-example/ ${MCF_HOME}/multiprocess-file-example/
+COPY dist/multiprocess-zk-example/ ${MCF_HOME}/multiprocess-zk-example/
+COPY dist/obfuscation-utility/ ${MCF_HOME}/obfuscation-utility/
+COPY dist/web/war/ ${MCF_HOME}/web/war/
+COPY dist/connector-build.xml ${MCF_HOME}/
+COPY dist/connectors.xml ${MCF_HOME}/
+COPY dist/DEPENDENCIES.txt ${MCF_HOME}/
+COPY dist/LICENSE.txt ${MCF_HOME}/
+COPY dist/NOTICE.txt ${MCF_HOME}/
+COPY dist/README.txt ${MCF_HOME}/
LABEL maintainer="Apache ManifoldCF Developers <[email protected]>"
LABEL org.opencontainers.image.title="Apache ManifoldCF"
diff --git a/src/main/docker/JDK-21/Dockerfile
b/src/main/docker/JDK-21/Dockerfile
index 2809aacda..28d5de33e 100644
--- a/src/main/docker/JDK-21/Dockerfile
+++ b/src/main/docker/JDK-21/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM eclipse-temurin:21-jre-jammy
+FROM eclipse-temurin:21-jre-noble
LABEL maintainer="The Apache ManifoldCF Project"
ARG MCF_VERSION="2.30-SNAPSHOT"
@@ -30,28 +30,23 @@ ARG MCF_PORT=8345
RUN apt-get update && apt-get install -y iputils-ping && \
apt-get install -y dnsutils
-COPY dist/. ${MCF_HOME}/
+#Below the specific COPY instructions to configure a distribution without
propprietary artifacts and plugins
-#Below the specific COPY instructions to configure a distribution without
propprietary artifacts
-#COPY dist/connector-build.xml ${MCF_HOME}/connector-build.xml
-#COPY dist/connectors.xml ${MCF_HOME}/connectors.xml
-#COPY dist/DEPENDENCIES.txt ${MCF_HOME}/DEPENDENCIES.txt
-#COPY dist/LICENSE.txt ${MCF_HOME}/LICENSE.txt
-#COPY dist/README.txt ${MCF_HOME}/README.txt
-
-#COPY dist/connector-common-lib ${MCF_HOME}/connector-common-lib
-#COPY dist/connector-lib ${MCF_HOME}/connector-lib
-#COPY dist/doc ${MCF_HOME}/doc
-#COPY dist/example ${MCF_HOME}/example
-#COPY dist/file-resources ${MCF_HOME}/file-resources
-#COPY dist/lib ${MCF_HOME}/lib
-#COPY dist/multiprocess-file-example ${MCF_HOME}/multiprocess-file-example
-#COPY dist/multiprocess-zk-example ${MCF_HOME}/multiprocess-zk-example
-#COPY dist/obfuscation-utility ${MCF_HOME}/obfuscation-utility
-#COPY dist/plugins/solr ${MCF_HOME}/plugins/solr
-#COPY dist/script-engine ${MCF_HOME}/script-engine
-#COPY dist/test-lib ${MCF_HOME}/test-lib
-#COPY dist/web/war ${MCF_HOME}/web/war
+COPY dist/connector-common-lib/ ${MCF_HOME}/connector-common-lib/
+COPY dist/connector-lib/ ${MCF_HOME}/connector-lib/
+COPY dist/example/ ${MCF_HOME}/example/
+COPY dist/file-resources/ ${MCF_HOME}/file-resources/
+COPY dist/lib/ ${MCF_HOME}/lib/
+COPY dist/multiprocess-file-example/ ${MCF_HOME}/multiprocess-file-example/
+COPY dist/multiprocess-zk-example/ ${MCF_HOME}/multiprocess-zk-example/
+COPY dist/obfuscation-utility/ ${MCF_HOME}/obfuscation-utility/
+COPY dist/web/war/ ${MCF_HOME}/web/war/
+COPY dist/connector-build.xml ${MCF_HOME}/
+COPY dist/connectors.xml ${MCF_HOME}/
+COPY dist/DEPENDENCIES.txt ${MCF_HOME}/
+COPY dist/LICENSE.txt ${MCF_HOME}/
+COPY dist/NOTICE.txt ${MCF_HOME}/
+COPY dist/README.txt ${MCF_HOME}/
LABEL maintainer="Apache ManifoldCF Developers <[email protected]>"
LABEL org.opencontainers.image.title="Apache ManifoldCF"
@@ -74,7 +69,7 @@ ENV MCF_PORT="8345"
RUN set -ex; \
groupadd -r --gid "$MCF_GROUP_ID" "$MCF_GROUP"; \
useradd -r --uid "$MCF_USER_ID" --gid "$MCF_GROUP_ID" "$MCF_USER"
-
+
COPY src/main/docker/logging/logging.xml ${MCF_HOME}/example
RUN chown ${MCF_USER}:${MCF_USER} -R ${MCF_HOME}
