Skip to content

fix: docker build process failing on helper script #1785

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

Merged
merged 5 commits into from
Feb 27, 2025
Merged

fix: docker build process failing on helper script #1785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2688a29
fix: docker build process failing on helper script
RobPasMue Feb 27, 2025
9e85ced
chore: adding changelog file 1785.fixed.md [dependabot-skip]
pyansys-ci-bot Feb 27, 2025
d91e8e7
chore: using int instead of strings for version handling
RobPasMue Feb 27, 2025
b1c69d3
Merge branch 'feat/fix-docker-build' of https://github.com/ansys/pyan…
RobPasMue Feb 27, 2025
99f2adf
Merge branch 'main' into feat/fix-docker-build
RobPasMue Feb 27, 2025
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
1 change: 1 addition & 0 deletions doc/changelog.d/1785.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker build process failing on helper script
19 changes: 11 additions & 8 deletions docker/build_docker_windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
import urllib.request

# First, get all environment variables that start with AWP_ROOT
awp_root = {}
awp_root: dict[int, str] = {}
for env_key, env_val in os.environ.items():
if env_key.startswith("AWP_ROOT"):
# There is an Ansys installation... Check that the version is at
# least 2024R1. Environment variables are in the form
# AWP_ROOT241=/path/to/2024R1
#
# Get the version number
version = env_key.split("AWP_ROOT")[1]
if version < "241":
version = int(env_key.split("AWP_ROOT")[1])
if version < 241:
# This version is too old, so we will ignore it
continue
else:
Expand Down Expand Up @@ -95,9 +95,9 @@
# Copy the Geometry Service files to the temporary directory
print(f">>> Copying Geometry Service files to temporary directory to {TMP_DIR}")
if backend_selection == 1:
BIN_DIR = TMP_DIR / "bins" / "DockerWindows" / "bin" / "x64" / "Release_Headless" / "net472"
BIN_DIR = TMP_DIR / "archive" / "bin" / "x64" / "Release_Headless" / "net472"
else:
BIN_DIR = TMP_DIR / "bins" / "DockerWindows" / "bin" / "x64" / "Release_Core_Windows" / "net8.0"
BIN_DIR = TMP_DIR / "archive" / "bin" / "x64" / "Release_Core_Windows" / "net8.0"

# Create the directory structure
shutil.copytree(
Expand All @@ -110,7 +110,7 @@
zip_file = shutil.make_archive(
"windows-dms-binaries" if backend_selection == 1 else "windows-core-binaries",
"zip",
root_dir=TMP_DIR / "bins",
root_dir=TMP_DIR / "archive",
)

# Move the ZIP file to the docker directory
Expand All @@ -119,7 +119,7 @@

# Remove the temporary directory
print(">>> Removing Geometry Service files")
shutil.rmtree(TMP_DIR / "bins")
shutil.rmtree(TMP_DIR / "archive")

# Download the Dockerfile from the repository
print(">>> Downloading Dockerfile")
Expand All @@ -146,12 +146,15 @@
line = dockerfile.find("ENV AWP_ROOT")
if line != -1:
# Get the environment variable name
env_var = dockerfile[line : LENGTH_NO_VER + line] + ANSYS_VER
env_var = f"{dockerfile[line : LENGTH_NO_VER + line]}{ANSYS_VER}"
# Replace the environment variable with the correct value
dockerfile = dockerfile.replace(
dockerfile[line : LENGTH_VER + line],
env_var,
)
# Write the updated Dockerfile
with Path.open(TMP_DIR / "Dockerfile", "w") as f:
f.write(dockerfile)
else:
print(
"XXXXXXX No AWP_ROOT environment variable found in Dockerfile.. exiting process. XXXXXXX" # noqa: E501
Expand Down
Loading