Skip to content

Commit cbb6428

Browse files
committed
fix: renaming Dockerfiles (#993)
1 parent 0a920df commit cbb6428

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/ci_cd.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ jobs:
469469
- name: Build Docker image
470470
working-directory: docker
471471
run: |
472-
docker build -f Dockerfile.windows -t ghcr.io/ansys/geometry:windows-latest-tmp .
472+
docker build -f windows/Dockerfile -t ghcr.io/ansys/geometry:windows-latest-tmp .
473473
474474
- name: Check location of self-hosted runner and define license server accordingly
475475
if: runner.name == 'pygeometry-ci-1' || runner.name == 'pygeometry-ci-2'
@@ -500,10 +500,10 @@ jobs:
500500
.\.venv\Scripts\Activate.ps1
501501
pytest -v --use-existing-service=yes
502502
503-
- name: "Compressing Dockerfile.windows"
503+
- name: "Compressing Windows Dockerfile"
504504
uses: vimtor/action-zip@v1.2
505505
with:
506-
files: docker/Dockerfile.windows
506+
files: docker/windows/Dockerfile
507507
dest: windows-dockerfile.zip
508508

509509
- name: Upload Windows Dockerfile
@@ -561,7 +561,7 @@ jobs:
561561
- name: Build Docker image
562562
working-directory: docker
563563
run: |
564-
docker build -f Dockerfile.linux -t ghcr.io/ansys/geometry:linux-latest-tmp .
564+
docker build -f linux/Dockerfile -t ghcr.io/ansys/geometry:linux-latest-tmp .
565565
566566
- name: Launch Geometry service
567567
run: |
@@ -590,10 +590,10 @@ jobs:
590590
checkout: false
591591
requires-xvfb: true
592592

593-
- name: "Compressing Dockerfile.linux"
593+
- name: "Compressing Linux Dockerfile"
594594
uses: vimtor/action-zip@v1.2
595595
with:
596-
files: docker/Dockerfile.linux
596+
files: docker/linux/Dockerfile
597597
dest: linux-dockerfile.zip
598598

599599
- name: Upload Linux Dockerfile

doc/source/getting_started/docker/windows_container.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ these steps.
9797

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

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

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

106-
This guide focuses on building the ``Dockerfile.windows`` image.
106+
This guide focuses on building the ``windows/Dockerfile`` image.
107107

108108
There are two build modes:
109109

@@ -154,7 +154,7 @@ Build the Docker image from available binaries
154154

155155
Prior to building your image, follow these steps:
156156

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

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

173173
.. code:: bash
174174
175-
docker build -t ghcr.io/ansys/geometry:windows-latest -f Dockerfile.windows .
175+
docker build -t ghcr.io/ansys/geometry:windows-latest -f windows/Dockerfile .
176176
177177
#. Check that the image has been created successfully. You should see output similar
178178
to this:

docker/build_docker_windows.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
# Download the Dockerfile from the repository
107107
print(">>> Downloading Dockerfile")
108108
urllib.request.urlretrieve(
109-
"https://raw.githubusercontent.com/ansys/pyansys-geometry/main/docker/Dockerfile.windows",
109+
"https://raw.githubusercontent.com/ansys/pyansys-geometry/main/docker/windows/Dockerfile",
110110
os.path.join(TMP_DIR, "Dockerfile"),
111111
)
112112

0 commit comments

Comments
 (0)