Skip to content

Commit

Permalink
fix: renaming Dockerfiles (#993)
Browse files Browse the repository at this point in the history
  • Loading branch information
RobPasMue committed Feb 16, 2024
1 parent 0a920df commit cbb6428
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ jobs:
- name: Build Docker image
working-directory: docker
run: |
docker build -f Dockerfile.windows -t ghcr.io/ansys/geometry:windows-latest-tmp .
docker build -f windows/Dockerfile -t ghcr.io/ansys/geometry:windows-latest-tmp .
- name: Check location of self-hosted runner and define license server accordingly
if: runner.name == 'pygeometry-ci-1' || runner.name == 'pygeometry-ci-2'
Expand Down Expand Up @@ -500,10 +500,10 @@ jobs:
.\.venv\Scripts\Activate.ps1
pytest -v --use-existing-service=yes
- name: "Compressing Dockerfile.windows"
- name: "Compressing Windows Dockerfile"
uses: vimtor/[email protected]
with:
files: docker/Dockerfile.windows
files: docker/windows/Dockerfile
dest: windows-dockerfile.zip

- name: Upload Windows Dockerfile
Expand Down Expand Up @@ -561,7 +561,7 @@ jobs:
- name: Build Docker image
working-directory: docker
run: |
docker build -f Dockerfile.linux -t ghcr.io/ansys/geometry:linux-latest-tmp .
docker build -f linux/Dockerfile -t ghcr.io/ansys/geometry:linux-latest-tmp .
- name: Launch Geometry service
run: |
Expand Down Expand Up @@ -590,10 +590,10 @@ jobs:
checkout: false
requires-xvfb: true

- name: "Compressing Dockerfile.linux"
- name: "Compressing Linux Dockerfile"
uses: vimtor/[email protected]
with:
files: docker/Dockerfile.linux
files: docker/linux/Dockerfile
dest: linux-dockerfile.zip

- name: Upload Linux Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions doc/source/getting_started/docker/windows_container.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ these steps.

Inside the repository's ``docker`` folder, there are two ``Dockerfile`` files:

* ``Dockerfile.linux``: Builds the Linux-based Docker image.
* ``Dockerfile.windows``: Builds the Windows-based Docker image.
* ``linux/Dockerfile``: Builds the Linux-based Docker image.
* ``windows/Dockerfile``: Builds the Windows-based Docker image.

Depending on the characteristics of the Docker engine installed on your
machine, either one or the other has to be built.

This guide focuses on building the ``Dockerfile.windows`` image.
This guide focuses on building the ``windows/Dockerfile`` image.

There are two build modes:

Expand Down Expand Up @@ -154,7 +154,7 @@ Build the Docker image from available binaries

Prior to building your image, follow these steps:

* Download the `latest Windows Dockerfile <https://github.com/ansys/pyansys-geometry/blob/main/docker/Dockerfile.windows>`_.
* Download the `latest Windows Dockerfile <https://github.com/ansys/pyansys-geometry/blob/main/docker/windows/Dockerfile>`_.

* Download the `latest release artifacts for the Windows
Docker container (ZIP file) for your version <https://github.com/ansys/pyansys-geometry-binaries/>`_.
Expand All @@ -172,7 +172,7 @@ To build your image, follow these instructions:

.. code:: bash
docker build -t ghcr.io/ansys/geometry:windows-latest -f Dockerfile.windows .
docker build -t ghcr.io/ansys/geometry:windows-latest -f windows/Dockerfile .
#. Check that the image has been created successfully. You should see output similar
to this:
Expand Down
2 changes: 1 addition & 1 deletion docker/build_docker_windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
# Download the Dockerfile from the repository
print(">>> Downloading Dockerfile")
urllib.request.urlretrieve(
"https://raw.githubusercontent.com/ansys/pyansys-geometry/main/docker/Dockerfile.windows",
"https://raw.githubusercontent.com/ansys/pyansys-geometry/main/docker/windows/Dockerfile",
os.path.join(TMP_DIR, "Dockerfile"),
)

Expand Down

0 comments on commit cbb6428

Please sign in to comment.