From 728c6710d6a3a4835cabc91dd4f33db37ee2b8a5 Mon Sep 17 00:00:00 2001
From: Jake Landis <jake.landis@elastic.co>
Date: Thu, 3 Nov 2022 14:32:02 -0500
Subject: [PATCH] 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
---
 x-pack/qa/oidc-op-tests/build.gradle       | 7 -------
 x-pack/test/idp-fixture/docker-compose.yml | 4 +++-
 x-pack/test/idp-fixture/oidc/Dockerfile    | 9 +++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 x-pack/test/idp-fixture/oidc/Dockerfile

diff --git a/x-pack/qa/oidc-op-tests/build.gradle b/x-pack/qa/oidc-op-tests/build.gradle
index 131739c4a1334..d9394a8b3ce3e 100644
--- a/x-pack/qa/oidc-op-tests/build.gradle
+++ b/x-pack/qa/oidc-op-tests/build.gradle
@@ -1,5 +1,3 @@
-import org.elasticsearch.gradle.Architecture
-
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.test.fixtures'
 
@@ -17,8 +15,3 @@ tasks.named("processJavaRestTestResources").configure {
                   'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode_ec.crt'
           )
 }
-
-tasks.named("javaRestTest").configure {
-  // OpenID Connect fixture does not support aarm64
-  onlyIf { Architecture.current() == Architecture.X64 }
-}
diff --git a/x-pack/test/idp-fixture/docker-compose.yml b/x-pack/test/idp-fixture/docker-compose.yml
index 4a3af17a673ba..55abb618ddeac 100644
--- a/x-pack/test/idp-fixture/docker-compose.yml
+++ b/x-pack/test/idp-fixture/docker-compose.yml
@@ -155,7 +155,9 @@ services:
       - ./idp/shib-jetty-base/start.d/ssl.ini:/opt/shib-jetty-base/start.d/ssl.ini
 
   oidc-provider:
-    image: "c2id/c2id-server-demo:12.16.1"
+    build:
+      context: .
+      dockerfile: ./oidc/Dockerfile
     depends_on:
       - http-proxy
     ports:
diff --git a/x-pack/test/idp-fixture/oidc/Dockerfile b/x-pack/test/idp-fixture/oidc/Dockerfile
new file mode 100644
index 0000000000000..5974547a4d58a
--- /dev/null
+++ b/x-pack/test/idp-fixture/oidc/Dockerfile
@@ -0,0 +1,9 @@
+FROM c2id/c2id-server-demo:12.18 AS c2id
+FROM openjdk:11.0.16-jre
+
+COPY --from=c2id /c2id-server /c2id-server
+COPY --from=c2id /etc/c2id /etc/c2id
+
+ENV CATALINA_OPTS="-DsystemPropertiesURL=file:///etc/c2id/override.properties"
+EXPOSE 8080
+CMD ["/bin/bash", "/c2id-server/tomcat/bin/catalina.sh", "run"]