Skip to content

Commit 728c671

Browse files
authored
update c2id/c2id-server-demo docker image to support ARM (#91144) (#91292)
This commit updates the c2id docker image to the latest released version. This commit also introduces a multi-stage build with the openjdk image that supports ARM architectures. So our oidc tests now supports multiple archtectures. related: #89526 part of: #71378
1 parent c4e9b40 commit 728c671

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

x-pack/qa/oidc-op-tests/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.elasticsearch.gradle.Architecture
2-
31
apply plugin: 'elasticsearch.internal-java-rest-test'
42
apply plugin: 'elasticsearch.test.fixtures'
53

@@ -17,8 +15,3 @@ tasks.named("processJavaRestTestResources").configure {
1715
'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode_ec.crt'
1816
)
1917
}
20-
21-
tasks.named("javaRestTest").configure {
22-
// OpenID Connect fixture does not support aarm64
23-
onlyIf { Architecture.current() == Architecture.X64 }
24-
}

x-pack/test/idp-fixture/docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ services:
155155
- ./idp/shib-jetty-base/start.d/ssl.ini:/opt/shib-jetty-base/start.d/ssl.ini
156156

157157
oidc-provider:
158-
image: "c2id/c2id-server-demo:12.16.1"
158+
build:
159+
context: .
160+
dockerfile: ./oidc/Dockerfile
159161
depends_on:
160162
- http-proxy
161163
ports:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM c2id/c2id-server-demo:12.18 AS c2id
2+
FROM openjdk:11.0.16-jre
3+
4+
COPY --from=c2id /c2id-server /c2id-server
5+
COPY --from=c2id /etc/c2id /etc/c2id
6+
7+
ENV CATALINA_OPTS="-DsystemPropertiesURL=file:///etc/c2id/override.properties"
8+
EXPOSE 8080
9+
CMD ["/bin/bash", "/c2id-server/tomcat/bin/catalina.sh", "run"]

0 commit comments

Comments
 (0)