Skip to content

Commit

Permalink
[ACS-5768] Updated jolokia to current newest version and removed tomc…
Browse files Browse the repository at this point in the history
…at migrate.sh workaround script usage
  • Loading branch information
cezary-witkowski committed Nov 15, 2024
1 parent d2ea940 commit 5e9b4ce
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions tests/environment/alfresco-with-jolokia/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# BUILD STAGE
FROM alfresco/alfresco-content-repository:latest AS JOLOKIABUILDER

ARG JOLOKIA_VER=1.6.2
ARG JOLOKIA_VER=2.1.2
ARG TOMCAT_DIR=/usr/local/tomcat

USER root
RUN yum install -y curl-minimal unzip && \
mkdir -p /build/jolokia && \
curl -o /build/jolokia-jee.war https://repo1.maven.org/maven2/org/jolokia/jolokia-war-unsecured/${JOLOKIA_VER}/jolokia-war-unsecured-${JOLOKIA_VER}.war && \
${TOMCAT_DIR}/bin/migrate.sh /build/jolokia-jee.war /build/jolokia.war && \
unzip -q /build/jolokia.war -d /build/jolokia && chmod -R g+r,g-w,o= /build

# ACTUAL IMAGE
Expand Down
8 changes: 4 additions & 4 deletions tests/pipeline-all-amps/repo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ARG BASE_IMAGE
# BUILD STAGE SWAGGERBUILDER
FROM debian:11-slim AS SWAGGERBUILDER
FROM alfresco/alfresco-enterprise-repo-base:latest AS SWAGGERBUILDER

ARG JOLOKIA_VER=1.6.2
ARG JOLOKIA_VER=2.1.2

RUN DEBIAN_FRONTEND=noninteractive; \
apt-get update -yqq && apt-get -yqq install curl unzip && \
USER root
RUN yum install -y curl unzip && \
mkdir -p /build/{api-explorer,gs-api-explorer,jolokia} && \
curl -o /build/jolokia.war https://repo1.maven.org/maven2/org/jolokia/jolokia-war-unsecured/${JOLOKIA_VER}/jolokia-war-unsecured-${JOLOKIA_VER}.war && \
unzip -q /build/jolokia.war -d /build/jolokia
Expand Down

0 comments on commit 5e9b4ce

Please sign in to comment.