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

Pins versions of conan to < v2 in the ue4-full images #306

Merged
merged 1 commit into from
Mar 17, 2023
Merged

Pins versions of conan to < v2 in the ue4-full images #306

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
5 changes: 4 additions & 1 deletion src/ue4docker/dockerfiles/ue4-full/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG UE4CLI_VERSION="ue4cli>=0.0.45"
ARG CONAN_UE4CLI_VERSION="conan-ue4cli>=0.0.27"
ARG CONAN_VERSION="conan>=1.59.0,<2"
{% if combine %}
FROM source as conan
{% else %}
Expand All @@ -10,11 +11,12 @@ FROM ${NAMESPACE}/ue4-source:${TAG}-${PREREQS_TAG} AS conan
{% endif %}
ARG UE4CLI_VERSION
ARG CONAN_UE4CLI_VERSION
ARG CONAN_VERSION

# Install ue4cli and conan-ue4cli
USER root
RUN pip3 install --upgrade pip setuptools wheel
RUN pip3 install "$UE4CLI_VERSION" "$CONAN_UE4CLI_VERSION"
RUN pip3 install "$CONAN_VERSION" "$UE4CLI_VERSION" "$CONAN_UE4CLI_VERSION"
USER ue4

# Extract the third-party library details from UBT
Expand All @@ -29,6 +31,7 @@ FROM ${NAMESPACE}/ue4-minimal:${TAG}-${PREREQS_TAG}
{% endif %}
ARG UE4CLI_VERSION
ARG CONAN_UE4CLI_VERSION
ARG CONAN_VERSION

# Install CMake, ue4cli, conan-ue4cli, and ue4-ci-helpers
USER root
Expand Down
7 changes: 5 additions & 2 deletions src/ue4docker/dockerfiles/ue4-full/windows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# escape=`
ARG UE4CLI_VERSION="ue4cli>=0.0.45"
ARG CONAN_UE4CLI_VERSION="conan-ue4cli>=0.0.27"
ARG CONAN_VERSION="conan>=1.59.0,<2"
{% if combine %}
FROM source as conan
{% else %}
Expand All @@ -11,10 +12,11 @@ FROM ${NAMESPACE}/ue4-source:${TAG}-${PREREQS_TAG} AS conan
{% endif %}
ARG UE4CLI_VERSION
ARG CONAN_UE4CLI_VERSION
ARG CONAN_VERSION

# Install ue4cli and conan-ue4cli
RUN pip install setuptools wheel --no-warn-script-location
RUN pip install "%UE4CLI_VERSION%" "%CONAN_UE4CLI_VERSION%" --no-warn-script-location
RUN pip install "%CONAN_VERSION%" "%UE4CLI_VERSION%" "%CONAN_UE4CLI_VERSION%" --no-warn-script-location

# Build UBT, and extract the third-party library details from UBT
# (Remove the profile base packages to avoid a bug where Windows locks the files and breaks subsequent profile generation)
Expand All @@ -30,10 +32,11 @@ FROM ${NAMESPACE}/ue4-minimal:${TAG}-${PREREQS_TAG}
{% endif %}
ARG UE4CLI_VERSION
ARG CONAN_UE4CLI_VERSION
ARG CONAN_VERSION

# Install ue4cli conan-ue4cli, and ue4-ci-helpers
RUN pip install setuptools wheel --no-warn-script-location
RUN pip install "%UE4CLI_VERSION%" "%CONAN_UE4CLI_VERSION%" ue4-ci-helpers --no-warn-script-location
RUN pip install "%CONAN_VERSION%" "%UE4CLI_VERSION%" "%CONAN_UE4CLI_VERSION%" ue4-ci-helpers --no-warn-script-location

# Explicitly set the configuration directory for ue4cli
# (This prevents things from breaking when using CI/CD systems that override the $HOME environment variable)
Expand Down