From 2329159b11a4d21df8830feae6b0f13f665bb096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Ha=CC=88user?=
 <8659494+mhaeuser@users.noreply.github.com>
Date: Mon, 27 Mar 2023 20:50:50 +0200
Subject: [PATCH] Docker: Extend OpenCorePkg docker-compose

---
 .github/workflows/build.yml        | 10 ++++++++++
 Dockerfiles/oc-dev-edk2/Dockerfile | 16 ----------------
 OpenCorePkg                        |  2 +-
 docker-compose.yaml                | 27 +++++----------------------
 4 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100755 Dockerfiles/oc-dev-edk2/Dockerfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1b8e578a5..0ded7b364b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,6 +20,8 @@ jobs:
       JOB_TYPE: BUILD
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Add Linux Toolchain
         run: brew tap FiloSottile/homebrew-musl-cross
@@ -222,6 +224,8 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Install Dependencies
         run: |
@@ -409,6 +413,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Use Docker in rootless mode.
         uses: ScribeMD/rootless-docker@0.2.2
@@ -618,6 +624,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Use Docker in rootless mode.
         uses: ScribeMD/rootless-docker@0.2.2
@@ -827,6 +835,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Use Docker in rootless mode.
         uses: ScribeMD/rootless-docker@0.2.2
diff --git a/Dockerfiles/oc-dev-edk2/Dockerfile b/Dockerfiles/oc-dev-edk2/Dockerfile
deleted file mode 100755
index c66155dec5..0000000000
--- a/Dockerfiles/oc-dev-edk2/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:22.04
-
-ARG OC_DEV_EDK2_LLVM_VER=15
-ARG DEBIAN_FRONTEND=noninteractive
-
-SHELL ["/bin/bash", "-c"]
-
-RUN apt-get update
-RUN [ "$(uname -m)" == "x86_64" ] && apt-get install -y gcc-multilib
-RUN apt-get install -y lsb-release wget software-properties-common gnupg build-essential nasm uuid-dev libssl-dev iasl curl git zip && \
-    { [ "$(dpkg --print-architecture)" == "amd64" ] || { apt-get install -y gcc-x86-64-linux-gnu && export GCC5_BIN=x86_64-linux-gnu- ; } ; } && echo "export GCC5_BIN=$GCC5_BIN" > ~/.edk2_rc.sh && echo ". ~/.edk2_rc.sh" > /etc/profile.d/edk2-gcc5.sh && \
-    wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh ${OC_DEV_EDK2_LLVM_VER} && rm -f llvm.sh && \
-    apt-get purge --auto-remove -y wget software-properties-common gnupg && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV PATH="$PATH:/usr/lib/llvm-${OC_DEV_EDK2_LLVM_VER}/bin"
diff --git a/OpenCorePkg b/OpenCorePkg
index 86ef0dc2e8..2002cbfe05 160000
--- a/OpenCorePkg
+++ b/OpenCorePkg
@@ -1 +1 @@
-Subproject commit 86ef0dc2e82219afffafd64cbdb2653b98edefe0
+Subproject commit 2002cbfe0551970f6a09932741998d5dba67b380
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 27078e8a03..1d2b6adde7 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,29 +1,12 @@
 name: audk
 services:
-  dev-edk2:
-    build:
-      context: Dockerfiles/oc-dev-edk2
-      tags:
-        - "oc-dev-edk2"
   build-package:
-    depends_on:
-      - dev-edk2
-    image: oc-dev-edk2
+    extends:
+      service: dev-edk2
+      file: OpenCorePkg/docker-compose.yaml
     environment:
-    - ARCHS
-    - ARCHS_EXT
-    - SELFPKG
-    - SELFPKG_DIR
-    - TARGETS
-    - RTARGETS
-    - TOOLCHAINS
-    - SKIP_TESTS
-    - SKIP_BUILD
-    - SKIP_PACKAGE
-    - BUILD_ARGUMENTS
-    volumes:
-      - .:/com.docker.devenvironments.code
-    working_dir: /com.docker.devenvironments.code
+      - SELFPKG
+      - SELFPKG_DIR
     entrypoint:
       - /bin/bash
       - -c