Skip to content

Commit ed210ce

Browse files
author
Justin Lewis Salmon
authored
Copy UBT from minimal to conan stage if present
See adamrehn#281 and adamrehn/conan-ue4cli#20 This also requires adamrehn/conan-ue4cli#15 to make `ue4 conan generate` work on UE5.
1 parent f8aeea8 commit ed210ce

File tree

1 file changed

+8
-0
lines changed
  • src/ue4docker/dockerfiles/ue4-full/linux

1 file changed

+8
-0
lines changed

src/ue4docker/dockerfiles/ue4-full/linux/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ RUN pip3 install --upgrade pip setuptools wheel
1919
RUN pip3 install "$CONAN_VERSION" "$UE4CLI_VERSION" "$CONAN_UE4CLI_VERSION"
2020
USER ue4
2121

22+
# Copy in UBT from minimal image, if present (required for `ue4 conan generate` to work on UE5)
23+
ARG UBT_DIR="/home/ue4/UnrealEngine/Engine/Binaries/DotNET"
24+
{% if combine %}
25+
COPY --from=minimal --chown=ue4:ue4 $UBT_DIR/UnrealBuildToo[l] $UBT_DIR/UnrealBuildTool
26+
{% else %}
27+
COPY --from=${NAMESPACE}/ue4-minimal:${TAG}-${PREREQS_TAG} --chown=ue4:ue4 $UBT_DIR/UnrealBuildToo[l] $UBT_DIR/UnrealBuildTool
28+
{% endif %}
29+
2230
# Extract the third-party library details from UBT
2331
RUN ue4 setroot /home/ue4/UnrealEngine
2432
RUN ue4 conan generate

0 commit comments

Comments
 (0)