fix: release issues encountered (#1637)

Co-authored-by: pyansys-ci-bot <[email protected]>

Author: RobPasMue

.github/workflows/ci_cd.yml

@@ -659,8 +659,10 @@ jobs:
       matrix:
         include:
           - mode: "dms"
+            docker-file: "windows-dms-dockerfile.zip"
             zip-file: "windows-dms-binaries.zip"
           - mode: "coreservice"
+            docker-file: "windows-core-dockerfile.zip"
             zip-file: "windows-core-binaries.zip"
     steps:
       - name: Checkout repository
@@ -720,8 +722,8 @@ jobs:
       - name: Upload Windows Dockerfile
         uses: actions/upload-artifact@v4
         with:
-          name: windows-${{ matrix.mode }}-dockerfile.zip
-          path: windows-${{ matrix.mode }}-dockerfile.zip
+          name: ${{ matrix.docker-file }}
+          path: ${{ matrix.docker-file }}
           retention-days: 7
 
       - name: Stop the Geometry service
@@ -772,7 +774,7 @@ jobs:
       - name: Build Docker image
         working-directory: docker
         run: |
-          docker build -f linux/Dockerfile -t ghcr.io/ansys/geometry:linux-tmp .
+          docker build -f linux/coreservice/Dockerfile -t ghcr.io/ansys/geometry:linux-tmp .
 
       - name: Launch Geometry service
         run: |

doc/changelog.d/1339.changed.md

@@ -0,0 +1 @@
+release issues encountered

doc/changelog.d/1637.fixed.md

@@ -17,9 +17,9 @@ RUN apt-get update && \
 COPY linux-core-binaries.zip .
 RUN unzip -qq linux-core-binaries.zip -d . && \
     rm linux-core-binaries.zip && \
-    chmod -R 0755 DockerLinux && \
-    mv DockerLinux/bin/x64/Release_Linux/net8.0/* . && \
-    rm -rf DockerLinux
+    chmod -R 0755 bin && \
+    mv bin/x64/Release_Core_Linux/net8.0/* . && \
+    rm -rf bin
 
 # Let the dynamic link loader where to search for shared libraries
 ENV LD_LIBRARY_PATH=/app:/app/CADIntegration/bin:/app/Native/Linux

docker/linux/coreservice/Dockerfile

@@ -21,8 +21,8 @@ WORKDIR /app
 COPY windows-core-binaries.zip .
 RUN mkdir tmp_folder && \
     tar -xf windows-core-binaries.zip -C tmp_folder && \
-    xcopy tmp_folder\DockerWindows\bin\x64\Release_Core_Windows\net8.0\* . /e /i /h && \
-    xcopy tmp_folder\DockerWindows\* . && \
+    xcopy tmp_folder\bin\x64\Release_Core_Windows\net8.0\* . /e /i /h && \
+    xcopy tmp_folder\* . && \
     del windows-core-binaries.zip && \
     rmdir /s /q tmp_folder
 
@@ -47,4 +47,5 @@ LABEL org.opencontainers.image.vendor="ANSYS Inc."
 EXPOSE 50051
 
 # Define the entrypoint for the Geometry service
-ENTRYPOINT ["dotnet", "C:\app\Presentation.ApiServerLinux.dll"]
+# hadolint ignore=DL3025
+ENTRYPOINT dotnet C:\app\Presentation.ApiServerLinux.dll

docker/windows/coreservice/Dockerfile

@@ -19,8 +19,8 @@ WORKDIR /app
 COPY windows-dms-binaries.zip .
 RUN mkdir tmp_folder && \
     tar -xf windows-dms-binaries.zip -C tmp_folder && \
-    xcopy tmp_folder\DockerWindows\bin\x64\Release_Headless\net472\* . /e /i /h && \
-    xcopy tmp_folder\DockerWindows\* . && \
+    xcopy tmp_folder\bin\x64\Release_Headless\net472\* . /e /i /h && \
+    xcopy tmp_folder\* . && \
     del windows-dms-binaries.zip && \
     rmdir /s /q tmp_folder
 
@@ -29,7 +29,7 @@ ENV LICENSE_SERVER=""
 ENV SERVER_ENDPOINT="0.0.0.0:50051"
 ENV ENABLE_TRACE=0
 ENV LOG_LEVEL=2
-ENV AWP_ROOT251=C:/app/unified
+ENV AWP_ROOT252=C:/app/unified
 
 # Add container labels
 LABEL org.opencontainers.image.authors="ANSYS Inc."