Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS-5768] Switch to the Jakarta compatible Jolokia web application #2989

Merged
merged 6 commits into from
Nov 21, 2024
Merged

[ACS-5768] Switch to the Jakarta compatible Jolokia web application #2989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e9b4ce
[ACS-5768] Updated jolokia to current newest version and removed tomc…
cezary-witkowski Nov 15, 2024
abdc5bf
[ACS-5768] Wrong name in script fix
cezary-witkowski Nov 15, 2024
22c0d0e
[ACS-5768] From 2.0.0 they changed the name from jolokia-war-unsecure…
cezary-witkowski Nov 15, 2024
44e3dfb
[ACS-5768] Switch to alpine for build stage
cezary-witkowski Nov 15, 2024
303a5c3
Merge branch 'master' into feature/ACS-5768-jolokia-update
cezary-witkowski Nov 18, 2024
3df04c7
[ACS-5768] Going back to alfresco-enterprise-repo-base
cezary-witkowski Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions tests/environment/alfresco-with-jolokia/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# BUILD STAGE
FROM alfresco/alfresco-content-repository:latest AS JOLOKIABUILDER

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

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
curl -o /build/jolokia.war https://repo1.maven.org/maven2/org/jolokia/jolokia-agent-war-unsecured/${JOLOKIA_VER}/jolokia-agent-war-unsecured-${JOLOKIA_VER}.war && \
unzip -q /build/jolokia.war -d /build/jolokia && \
chmod -R g+r,g-w,o= /build

# ACTUAL IMAGE
FROM alfresco/alfresco-content-repository:latest
Expand Down
10 changes: 5 additions & 5 deletions tests/pipeline-all-amps/repo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ARG BASE_IMAGE
# BUILD STAGE SWAGGERBUILDER
FROM debian:11-slim AS SWAGGERBUILDER
FROM alfresco/alfresco-content-repository: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-minimal 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 && \
curl -o /build/jolokia.war https://repo1.maven.org/maven2/org/jolokia/jolokia-agent-war-unsecured/${JOLOKIA_VER}/jolokia-agent-war-unsecured-${JOLOKIA_VER}.war && \
unzip -q /build/jolokia.war -d /build/jolokia

COPY target/wars/api-explorer.war /build
Expand Down