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

Jump to bottom

fix(docker): edk2-stable202408 missing submodule #392

Merged
merged 4 commits into from
Nov 11, 2024
Merged

fix(docker): edk2-stable202408 missing submodule #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb891d1
fix(docker)!: edk2-stable202408 missing submodule
Nov 7, 2024
aa2f1e5
fix(docker/edk2): possibly broken docker arguments
Nov 7, 2024
e3ec52c
fix(docker/edk2): shallow submodules
AtomicFS Nov 8, 2024
696722a
fix(docker/edk2): shallow submodules for edk2-stable202008
AtomicFS Nov 11, 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
6 changes: 3 additions & 3 deletions docker/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ services:
- INTERMEDIATE_IMAGE=universalpayload
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
edk2-stable202408:
edk2-stable202408.01:
build:
context: edk2
args:
- EDK2_VERSION=edk2-stable202408
- EDK2_VERSION_COMMIT=b158dad150bf02879668f72ce306445250838201
- EDK2_VERSION=edk2-stable202408.01
- EDK2_VERSION_COMMIT=4dfdca63a93497203f197ec98ba20e2327e4afe4
- SOURCE_IMAGE=buildpack-deps:noble
- EDK2_PLATFORM_COMMIT=8676e88233d41323ed3b3a9087288e83cc87ebf7
- EDK2_NON_OSI_COMMIT=4e36179c55f49a73fe4805baa2b5f9fdd0a07a67
Expand Down
12 changes: 11 additions & 1 deletion docker/edk2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ FROM ${SOURCE_IMAGE} AS base
ARG TARGETARCH

ARG EDK2_VERSION=edk2-stable202008
ENV EDK2_VERSION=$EDK2_VERSION
ARG EDK2_VERSION_COMMIT=06dc822d045c2bb42e497487935485302486e151
ENV EDK2_VERSION_COMMIT=$EDK2_VERSION_COMMIT
ARG EDK2_PLATFORM_COMMIT=7093026e924291b9e9f6f5211a052c6a761a4704
ENV EDK2_PLATFORM_COMMIT=$EDK2_PLATFORM_COMMIT
ARG EDK2_NON_OSI_COMMIT=4f88718028316aee31cb577f7127d5706255722d
ENV EDK2_NON_OSI_COMMIT=$EDK2_NON_OSI_COMMIT

ARG GCC_VERSION=9
ENV GCC_VERSION=$GCC_VERSION
Expand Down Expand Up @@ -118,6 +122,8 @@ RUN apt-get update && \
ARG INTERMEDIATE_IMAGE
FROM ${INTERMEDIATE_IMAGE} AS toolchain

ARG TARGETARCH

# workaround to get shallow clone of specific commit
# https://stackoverflow.com/questions/31278902/how-to-shallow-clone-a-specific-commit-with-depth-1/43136160#43136160
WORKDIR $TOOLSDIR
Expand All @@ -141,7 +147,11 @@ RUN mkdir Edk2 && \
git remote add origin https://github.com/tianocore/edk2.git && \
git fetch --depth 1 origin "${EDK2_VERSION_COMMIT}" && \
git checkout "${EDK2_VERSION_COMMIT}" && \
git submodule update --init --recursive && \
if [ "${EDK2_VERSION}" = 'edk2-stable202008' ]; then \
git submodule update --init --recursive; \
else \
git submodule update --init --recursive --depth 1; \
fi && \
if [ "${TARGETARCH}" = 'amd64' ]; then \
make -C BaseTools/ -j "$(nproc)"; \
fi;
Expand Down
Loading