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

fix(docker): downgrade NodeJS for udk2017 #508

Merged
merged 1 commit into from
Jan 20, 2025
Merged

fix(docker): downgrade NodeJS for udk2017 #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions docker/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ services:
- PYTHON_VERSION=python2
- GCC_CROSS_COMPILER_PACKAGES_ARM=gcc-aarch64-linux-gnu gcc-arm-linux-gnueabi gcc-i686-linux-gnu
- GCC_CROSS_COMPILER_PACKAGES_X86=gcc-i686-linux-gnu
- NODESOURCE=https://deb.nodesource.com/setup_16.x
# NonOSI wasn't used in 2017
edk2-stable202008:
build:
Expand All @@ -69,6 +70,7 @@ services:
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202105:
build:
context: edk2
Expand All @@ -81,6 +83,7 @@ services:
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202111:
build:
context: edk2
Expand All @@ -93,6 +96,7 @@ services:
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
# Building UniversalPayload from this point on is likely ???
edk2-stable202205:
build:
Expand All @@ -107,6 +111,7 @@ services:
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202208:
build:
context: edk2
Expand All @@ -120,6 +125,7 @@ services:
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202211:
build:
context: edk2
Expand All @@ -132,6 +138,7 @@ services:
- INTERMEDIATE_IMAGE=universalpayload
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202302:
build:
context: edk2
Expand All @@ -145,6 +152,7 @@ services:
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202305:
build:
context: edk2
Expand All @@ -158,6 +166,7 @@ services:
- GCC_VERSION=9
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
# Since edk2-stable202305 the GCC_VERSION should be more flexible
# https://github.com/tianocore/edk2/commit/0fc07b1c6a491fa1e81daed6cfc2ec33c8cac973
edk2-stable202308:
Expand All @@ -173,6 +182,7 @@ services:
- GCC_VERSION=12
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202311:
build:
context: edk2
Expand All @@ -186,6 +196,7 @@ services:
- GCC_VERSION=12
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202402:
build:
context: edk2
Expand All @@ -199,6 +210,7 @@ services:
- GCC_VERSION=12
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202405:
build:
context: edk2
Expand All @@ -212,6 +224,7 @@ services:
- GCC_VERSION=12
- PYTHON_PACKAGES=python-is-python3 python2 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
edk2-stable202408.01:
build:
context: edk2
Expand All @@ -225,6 +238,7 @@ services:
- GCC_VERSION=13
- PYTHON_PACKAGES=python-is-python3 python3
- PYTHON_VERSION=python3
- NODESOURCE=https://deb.nodesource.com/setup_20.x
#==================
# linux
#==================
Expand Down
4 changes: 3 additions & 1 deletion docker/edk2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
ARG SOURCE_IMAGE=buildpack-deps:focal
ARG INTERMEDIATE_IMAGE=base
ARG TARGETARCH=amd64
ARG NODESOURCE=https://deb.nodesource.com/setup_20.x

#=============
# "base" stage with all needed build dependencies
FROM ${SOURCE_IMAGE} AS base

ARG TARGETARCH
ARG NODESOURCE

ARG EDK2_VERSION=edk2-stable202008
ENV EDK2_VERSION=$EDK2_VERSION
Expand Down Expand Up @@ -45,7 +47,7 @@ ENV WORKSPACE=$TOOLSDIR/Edk2
RUN if [ "${TARGETARCH}" = 'amd64' ]; then \
dpkg --add-architecture i386; \
fi; \
wget --quiet -O nodesource_setup.sh https://deb.nodesource.com/setup_20.x && \
wget --quiet -O nodesource_setup.sh "${NODESOURCE}" && \
chmod +x nodesource_setup.sh && \
./nodesource_setup.sh && \
apt-get update && \
Expand Down
Loading