From 58d8581009ad7ae1d9496ac3dd04205afd1bc896 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 21 Nov 2024 12:58:07 +0100 Subject: [PATCH] Revert "mix local and remote build contexts" This reverts commit 6622f9cb7282ac24cdddfe351ed0573816b2c312. --- audit-storage/Dockerfile | 6 ++---- docker-bake.hcl | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/audit-storage/Dockerfile b/audit-storage/Dockerfile index ac71ddef..c0d72f1e 100644 --- a/audit-storage/Dockerfile +++ b/audit-storage/Dockerfile @@ -7,8 +7,7 @@ ARG ALFRESCO_AUDIT_STORAGE_GROUP_ID ARG ALFRESCO_AUDIT_STORAGE_USER_NAME ARG ALFRESCO_AUDIT_STORAGE_USER_ID -COPY alfresco-audit-storage-app*.jar /opt/app.jar -COPY --from=local alfresco-audit-storage-app*.jar /opt/app.jar +ADD alfresco-audit-storage-app*.jar /opt/app.jar ENV AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_USERNAME=admin @@ -18,6 +17,5 @@ RUN groupadd -g ${ALFRESCO_AUDIT_STORAGE_GROUP_ID} ${ALFRESCO_AUDIT_STORAGE_GROU USER ${ALFRESCO_AUDIT_STORAGE_USER_NAME} -ADD entrypoint.sh /entrypoint.sh - +COPY entrypoint.sh /entrypoint.sh CMD ["/entrypoint.sh"] diff --git a/docker-bake.hcl b/docker-bake.hcl index 4e77ef6e..1644fdc4 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -801,7 +801,6 @@ target "audit-storage" { dockerfile = "Dockerfile" inherits = ["java_base"] contexts = { - local = "cwd://audit-storage" java_base = "target:java_base" } args = {