Skip to content

Commit 480c3ee

Browse files
committed
Use ubi8/openjdk-8 instead of docker.io/maven for JMS tests
1 parent 54076af commit 480c3ee

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ test-advancedserver: test/docker/vendor
258258
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) EXPECTED_LICENSE=Production go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) $(TEST_OPTS_DOCKER)
259259

260260
.PHONY: build-devjmstest
261-
build-devjmstest:
261+
build-devjmstest: registry-login
262262
$(info $(SPACER)$(shell printf $(TITLE)"Build JMS tests for developer config"$(END)))
263263
cd test/messaging && docker build --tag $(DEV_JMS_IMAGE) .
264264

test/messaging/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,24 @@
1515
###############################################################################
1616
# Application build environment (Maven)
1717
###############################################################################
18-
FROM docker.io/maven:3-ibmjava as builder
19-
COPY pom.xml /usr/src/mymaven/
20-
WORKDIR /usr/src/mymaven
18+
FROM registry.redhat.io/ubi8/openjdk-8 as builder
19+
COPY pom.xml .
20+
#WORKDIR /usr/src/mymaven
2121
# Download dependencies separately, so Docker caches them
2222
RUN mvn dependency:go-offline install
2323
# Copy source
24-
COPY src /usr/src/mymaven/src
24+
COPY src .
2525
# Run the main build
2626
RUN mvn --offline install
2727
# Print a list of all the files (useful for debugging)
28-
RUN find /usr/src/mymaven
28+
RUN find .
2929

3030
###############################################################################
3131
# Application runtime (JRE only, no build environment)
3232
###############################################################################
33-
FROM docker.io/ibmjava:8-jre
34-
COPY --from=builder /usr/src/mymaven/target/*.jar /opt/app/
35-
COPY --from=builder /usr/src/mymaven/target/lib/*.jar /opt/app/
33+
# OpenJDK is not technically supported with the MQ client, but is good enough for these tests
34+
FROM registry.redhat.io/ubi8/openjdk-8-runtime
35+
COPY --from=builder /home/jboss/target/*.jar /opt/app/
36+
COPY --from=builder /home/jboss/target/lib/*.jar /opt/app/
3637
USER 1001
3738
ENTRYPOINT ["java", "-classpath", "/opt/app/*", "org.junit.platform.console.ConsoleLauncher", "-p", "com.ibm.mqcontainer.test", "--details", "verbose"]

0 commit comments

Comments
 (0)