From 579183030e08b578e6338d7c076975389f0b45a9 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Thu, 13 Jun 2024 16:08:26 +0200 Subject: [PATCH 1/9] fix: combine the docker compose files --- docker/docker-compose.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e0f5ee0a1c..f001928740 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -55,4 +55,28 @@ services: image: ${DOCKER_IMAGE} user: "0:0" entrypoint: "/bin/bash ansys -grpc" + +## To be executed after license server +# +# You need an env var which points to the docker dpf image: +# +# export DPF_DOCKER_IMAGE=ghcr.io/ansys/dpf-core:22.2dev +# +# As well as the `ANSYSLMD_LICENSE_FILE` env var. +# + + dpf: + image: ${DPF_DOCKER_IMAGE} + ports: + - '50056:50052' + restart: always + environment: + - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} + + mapdl-local: + user: "0:0" + volumes: + - ../:/local:cached + # Overwriting entrypoint + entrypoint: /bin/sh -c "echo 'Container is ready. You can now attach to it.'; while sleep 1000; do :; done" From 0217c954a923c86f16e8d5182fa5c6b5f868397c Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Thu, 13 Jun 2024 16:10:47 +0200 Subject: [PATCH 2/9] fix: change all the docs --- docker/docker-compose.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f001928740..e2de65bddc 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -73,6 +73,36 @@ services: environment: - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} +# DESCRIPTION +# =========== +# +# This docker-compose file extends the 'base' docker-compose file to run the docker in such a way that +# you can then attach your VSCode instance and work locally. +# +# It is said to be running as 'local' because it will mount the current directory in '/local' +# inside the container (presumably you will have the cloned repository in the current directory), +# and it will override the entrypoint to run the 'bash' command. +# +# +# USAGE +# ===== +# +# 1. You need to have the 'base' docker-compose file in the same directory as this file, and fullfil +# its requirements (license server env var). +# +# 2. Once you have done this, you can start the service by running: +# +# docker-compose -f docker-compose.yml -f docker-compose.local.yml up +# +# NOTES +# ===== +# +# - If you need to run a license server, please have a look at 'docker-compose.license_server.yml' +# file. In that case, the command to launch everything is: +# +# docker-compose -f docker-compose.yml -f docker-compose.license-server.yml -f docker-compose.local.yml up +# + mapdl-local: user: "0:0" volumes: From 0bd634e124bb1d46c9ae17c9c406b20b6e66c3a4 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Thu, 13 Jun 2024 16:34:50 +0200 Subject: [PATCH 3/9] fix: change all the docs --- docker/docker-compose.yml | 94 +++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e2de65bddc..b6ac7932e3 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,21 +1,21 @@ version: '3.3' -# This is a docker-compose file which launch a remote MAPDL instance in a dockerized environment. -# You can connect to this instance throught the port 50052 and 50055 (for the database feature). +# This is a docker-compose file which launches a remote MAPDL instance in a dockerized environment. +# You can connect to this instance through port 50052 and 50055 (for the database feature). # # For the license, you need to provide the hostname of the license server. # # REQUIREMENTS: # ============= # -# - docker -# - docker images from ghcr.io (you might need to do 'docker login ghcr.io' first) +# - Docker +# - Docker images from ghcr.io (you might need to do 'docker login ghcr.io' first) # # USAGE: # ====== # -# 1. You need two environment variables. One called ``DOCKER_IMAGE`` which contains the path to the -# docker image, and another one called ``ANSYSLMD_LICENSE_FILE`` which points to the license server. +# 1. You need two environment variables. One called `DOCKER_IMAGE` which contains the path to the +# Docker image, and another one called `ANSYSLMD_LICENSE_FILE` which points to the license server. # For example: # # export ANSYSLMD_LICENSE_FILE=1055@mylicensehost @@ -25,14 +25,14 @@ version: '3.3' # # docker-compose up # -# Optionally you can specify the '-d' flag for detaching mode (the container will run in the background). +# Optionally, you can specify the '-d' flag for detached mode (the container will run in the background). # # # NOTES: # ====== # -# - 'AWP_ROOT222' is where Ansys is installed. -# - The entrypoint must be defined in the docker image. +# - `AWP_ROOT222` is where Ansys is installed. +# - The entrypoint must be defined in the Docker image. # - If you want to mount the local directory, please add the 'volumes' section to the 'mapdl' service. # # volumes: @@ -56,14 +56,13 @@ services: user: "0:0" entrypoint: "/bin/bash ansys -grpc" -## To be executed after license server -# -# You need an env var which points to the docker dpf image: -# -# export DPF_DOCKER_IMAGE=ghcr.io/ansys/dpf-core:22.2dev -# -# As well as the `ANSYSLMD_LICENSE_FILE` env var. -# + # To be executed after license server + # You need an env var which points to the docker dpf image: + # + # export DPF_DOCKER_IMAGE=ghcr.io/ansys/dpf-core:22.2dev + # + # As well as the `ANSYSLMD_LICENSE_FILE` env var. + # dpf: image: ${DPF_DOCKER_IMAGE} @@ -73,40 +72,39 @@ services: environment: - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} -# DESCRIPTION -# =========== -# -# This docker-compose file extends the 'base' docker-compose file to run the docker in such a way that -# you can then attach your VSCode instance and work locally. -# -# It is said to be running as 'local' because it will mount the current directory in '/local' -# inside the container (presumably you will have the cloned repository in the current directory), -# and it will override the entrypoint to run the 'bash' command. -# -# -# USAGE -# ===== -# -# 1. You need to have the 'base' docker-compose file in the same directory as this file, and fullfil -# its requirements (license server env var). -# -# 2. Once you have done this, you can start the service by running: -# -# docker-compose -f docker-compose.yml -f docker-compose.local.yml up -# -# NOTES -# ===== -# -# - If you need to run a license server, please have a look at 'docker-compose.license_server.yml' -# file. In that case, the command to launch everything is: -# -# docker-compose -f docker-compose.yml -f docker-compose.license-server.yml -f docker-compose.local.yml up -# + # DESCRIPTION + # =========== + # + # This docker-compose file extends the 'base' docker-compose file to run the docker in such a way that + # you can then attach your VSCode instance and work locally. + # + # It is said to be running as 'local' because it will mount the current directory in '/local' + # inside the container (presumably you will have the cloned repository in the current directory), + # and it will override the entrypoint to run the 'bash' command. + # + # + # USAGE + # ===== + # + # 1. You need to have the 'base' docker-compose file in the same directory as this file, and fulfill + # its requirements (license server env var). + # + # 2. Once you have done this, you can start the service by running: + # + # docker-compose -f docker-compose.yml -f docker-compose.local.yml up + # + # NOTES + # ===== + # + # - If you need to run a license server, please have a look at 'docker-compose.license_server.yml' + # file. In that case, the command to launch everything is: + # + # docker-compose -f docker-compose.yml -f docker-compose.license-server.yml -f docker-compose.local.yml up + # mapdl-local: user: "0:0" volumes: - - ../:/local:cached + - ./:/local:cached # Overwriting entrypoint entrypoint: /bin/sh -c "echo 'Container is ready. You can now attach to it.'; while sleep 1000; do :; done" - From 80edbe6e93f78ebe9f5eb707b8593a2b6c41524c Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 14 Jun 2024 14:09:09 +0200 Subject: [PATCH 4/9] fix: combine the docker compose --- .gitignore | 1 + docker/docker-compose.dpf.yml | 17 ------- docker/docker-compose.local.yml | 39 --------------- docker/docker-compose.yml | 86 +++++++++++++++++---------------- 4 files changed, 45 insertions(+), 98 deletions(-) delete mode 100644 docker/docker-compose.dpf.yml delete mode 100644 docker/docker-compose.local.yml diff --git a/.gitignore b/.gitignore index 7ae4566255..873260f320 100755 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ docker/mapdl/v211 docker/mapdl/v212 docker/mapdl/_old docker/mapdl/*.sh +distributions/ # temp testing diff --git a/docker/docker-compose.dpf.yml b/docker/docker-compose.dpf.yml deleted file mode 100644 index aac7350e47..0000000000 --- a/docker/docker-compose.dpf.yml +++ /dev/null @@ -1,17 +0,0 @@ -## To be executed after license server -# -# You need an env var which points to the docker dpf image: -# -# export DPF_DOCKER_IMAGE=ghcr.io/ansys/dpf-core:22.2dev -# -# As well as the `ANSYSLMD_LICENSE_FILE` env var. -# - -services: - dpf: - image: ${DPF_DOCKER_IMAGE} - ports: - - '50056:50052' - restart: always - environment: - - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} \ No newline at end of file diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml deleted file mode 100644 index 9b54264487..0000000000 --- a/docker/docker-compose.local.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: '3.3' - -# DESCRIPTION -# =========== -# -# This docker-compose file extends the 'base' docker-compose file to run the docker in such a way that -# you can then attach your VSCode instance and work locally. -# -# It is said to be running as 'local' because it will mount the current directory in '/local' -# inside the container (presumably you will have the cloned repository in the current directory), -# and it will override the entrypoint to run the 'bash' command. -# -# -# USAGE -# ===== -# -# 1. You need to have the 'base' docker-compose file in the same directory as this file, and fullfil -# its requirements (license server env var). -# -# 2. Once you have done this, you can start the service by running: -# -# docker-compose -f docker-compose.yml -f docker-compose.local.yml up -# -# NOTES -# ===== -# -# - If you need to run a license server, please have a look at 'docker-compose.license_server.yml' -# file. In that case, the command to launch everything is: -# -# docker-compose -f docker-compose.yml -f docker-compose.license-server.yml -f docker-compose.local.yml up -# - -services: - mapdl: - user: "0:0" - volumes: - - ../:/local:cached - # Overwriting entrypoint - entrypoint: /bin/sh -c "echo 'Container is ready. You can now attach to it.'; while sleep 1000; do :; done" diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b6ac7932e3..aeea93ed4a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.3' -# This is a docker-compose file which launches a remote MAPDL instance in a dockerized environment. +# This is a docker-compose file that will run Ansys MAPDL and DPF in a container. # You can connect to this instance through port 50052 and 50055 (for the database feature). # # For the license, you need to provide the hostname of the license server. @@ -11,8 +11,8 @@ version: '3.3' # - Docker # - Docker images from ghcr.io (you might need to do 'docker login ghcr.io' first) # -# USAGE: -# ====== +# USAGE - MAPDL +# ============ # # 1. You need two environment variables. One called `DOCKER_IMAGE` which contains the path to the # Docker image, and another one called `ANSYSLMD_LICENSE_FILE` which points to the license server. @@ -23,11 +23,51 @@ version: '3.3' # # 2. Run the following command: # -# docker-compose up +# docker-compose up -d mapdl +# +# Optionally, you can specify the '-d' flag for detached mode (the container will run in the background). +# + +# USAGE - DPF +# =========== + +# 1. You need to have the 'DPF_DOCKER_IMAGE' environment variable set. For example: +# +# export DPF_DOCKER_IMAGE=ghcr.io/ansys/dpf-core:22.2dev +# +# as well as the `ANSYSLMD_LICENSE_FILE` env var. +# 2. Run the following command: +# +# docker-compose up -d dpf # # Optionally, you can specify the '-d' flag for detached mode (the container will run in the background). # # +# USAGE - MAPDL LOCAL +# =================== +# It is said to be running as 'local' because it will mount the current directory in '/local' +# inside the container (presumably you will have the cloned repository in the current directory), +# and it will override the entrypoint to run the 'bash' command. +# +# 1. You need to have the 'mapdl' service running. You can do this by running the command: +# +# docker-compose up -d mapdl +# +# 2. Once you have done this, you can start the service by running: +# +# docker-compose -f d mapdl-local +# +# 3. you can run together by ` +# docker-compose -up -d mapdl mapdl-local +# +# NOTES +# ===== +# +# - If you need to run a license server, please have a look at 'docker-compose.license_server.yml' +# file. In that case, the command to launch everything is: +# +# docker-compose -f docker-compose.yml -f docker-compose.license-server.yml -f docker-compose.local.yml up +# # NOTES: # ====== # @@ -56,14 +96,6 @@ services: user: "0:0" entrypoint: "/bin/bash ansys -grpc" - # To be executed after license server - # You need an env var which points to the docker dpf image: - # - # export DPF_DOCKER_IMAGE=ghcr.io/ansys/dpf-core:22.2dev - # - # As well as the `ANSYSLMD_LICENSE_FILE` env var. - # - dpf: image: ${DPF_DOCKER_IMAGE} ports: @@ -72,36 +104,6 @@ services: environment: - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} - # DESCRIPTION - # =========== - # - # This docker-compose file extends the 'base' docker-compose file to run the docker in such a way that - # you can then attach your VSCode instance and work locally. - # - # It is said to be running as 'local' because it will mount the current directory in '/local' - # inside the container (presumably you will have the cloned repository in the current directory), - # and it will override the entrypoint to run the 'bash' command. - # - # - # USAGE - # ===== - # - # 1. You need to have the 'base' docker-compose file in the same directory as this file, and fulfill - # its requirements (license server env var). - # - # 2. Once you have done this, you can start the service by running: - # - # docker-compose -f docker-compose.yml -f docker-compose.local.yml up - # - # NOTES - # ===== - # - # - If you need to run a license server, please have a look at 'docker-compose.license_server.yml' - # file. In that case, the command to launch everything is: - # - # docker-compose -f docker-compose.yml -f docker-compose.license-server.yml -f docker-compose.local.yml up - # - mapdl-local: user: "0:0" volumes: From 6cc52a10e09c56077f96bf9c355c6c1b2e88c006 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 14 Jun 2024 14:20:14 +0200 Subject: [PATCH 5/9] docs: update the docs --- doc/source/getting_started/docker.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/source/getting_started/docker.rst b/doc/source/getting_started/docker.rst index 93cf6ab703..3318009328 100644 --- a/doc/source/getting_started/docker.rst +++ b/doc/source/getting_started/docker.rst @@ -249,6 +249,12 @@ Using the `docker-compose.yml `_ file is recommend This is the *base* configuration file for launching an instance of MAPDL that you can connect to remotely. +you can use the following command to launch MAPDL: + +.. code:: bash + + docker-compose -f docker-compose.yml up -d mapdl + .. _pymapdl_connect_to_MAPDL_container: From 13c244c84a86636abdeb838c43fb0f1ab327efec Mon Sep 17 00:00:00 2001 From: Revathy Venugopal <104772255+Revathyvenugopal162@users.noreply.github.com> Date: Fri, 14 Jun 2024 15:23:16 +0200 Subject: [PATCH 6/9] Apply suggestions from code review --- docker/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index aeea93ed4a..072d86fe6b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -57,7 +57,8 @@ version: '3.3' # # docker-compose -f d mapdl-local # -# 3. you can run together by ` +# 3. you can run together by : +# # docker-compose -up -d mapdl mapdl-local # # NOTES From 4407d281d84ba0ffdc765200b0348739d03b71f2 Mon Sep 17 00:00:00 2001 From: German Date: Mon, 17 Jun 2024 14:25:56 +0200 Subject: [PATCH 7/9] Adding profiles. Forcing to use a service name or profile. There is no default because `mapdl` and `mapdl-local` are both excluding. --- docker/docker-compose.yml | 136 ++++++++++++++++++++++---------------- 1 file changed, 78 insertions(+), 58 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 072d86fe6b..b290b48be8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,87 +1,90 @@ -version: '3.3' - -# This is a docker-compose file that will run Ansys MAPDL and DPF in a container. -# You can connect to this instance through port 50052 and 50055 (for the database feature). +# This is a docker-compose file that will run Ansys MAPDL, and optionally DPF, in a container. +# You can connect to this instance through port 50052 and 50055 (for the MAPDL database feature). +# DPF server can be connected to using the port 50056. # -# For the license, you need to provide the hostname of the license server. +# For the license, you need to provide the hostname of the license server using ``ANSYSLMD_LICENSE_FILE`` +# environment variable. # # REQUIREMENTS: # ============= # # - Docker -# - Docker images from ghcr.io (you might need to do 'docker login ghcr.io' first) +# - MAPDL docker images +# - (Optional) DPF docker images # -# USAGE - MAPDL -# ============ +# USAGE +# ===== # # 1. You need two environment variables. One called `DOCKER_IMAGE` which contains the path to the # Docker image, and another one called `ANSYSLMD_LICENSE_FILE` which points to the license server. # For example: # -# export ANSYSLMD_LICENSE_FILE=1055@mylicensehost -# export DOCKER_IMAGE=myregistry.com/myimage:mytag +# .. code:: bash # -# 2. Run the following command: -# -# docker-compose up -d mapdl -# -# Optionally, you can specify the '-d' flag for detached mode (the container will run in the background). -# - -# USAGE - DPF -# =========== - -# 1. You need to have the 'DPF_DOCKER_IMAGE' environment variable set. For example: +# export ANSYSLMD_LICENSE_FILE=1055@mylicenseserver +# export DOCKER_IMAGE=myregistry.com/myimage:mytag +# export DPF_DOCKER_IMAGE=myregistry.com/mydpfimage:mydpftag # optional # -# export DPF_DOCKER_IMAGE=ghcr.io/ansys/dpf-core:22.2dev +# Additionally you can also configure the following environment variables: +# +# - ``AWP_ROOT``: Set the environment variable ``AWP_ROOTXXX`` where XXX is the MAPDL version. +# For instance, MAPDL 2022R1 is 222. +# - ``AWP_ROOT_VALUE``: Set the value of the ``AWP_ROOTXXX`` environment variable, which normally points +# to the MAPDL installation directory. +# - ``DOCKER_USER``: It should match the username inside the container. You can obtain this value by executing +# ``echo $USER`` in a terminal inside the container. +# +# 2. Run the following command from the ``docker`` directory. +# +# .. code:: bash +# +# cd docker +# docker-compose up -d %service_name% # -# as well as the `ANSYSLMD_LICENSE_FILE` env var. -# 2. Run the following command: +# This docker-compose file contains three services: # -# docker-compose up -d dpf +# - ``mapdl``: Core service. It runs an MAPDL instance with the gRPC server activated, and it open the +# specified port to allow incoming connections to it. +# - ``dpf``: DPF service which can be used for data processing. +# - ``mapdl-local``: Use this service to start an ubuntu docker image with MAPDL installed in it. +# It is said to be running as 'local' because it will mount the parent directory (``../``) in '/home/mapdl/pymapdl' +# This service allow VS Code to attach to it and do development inside the container. +# and it will override the entrypoint to run the 'bash' command. # -# Optionally, you can specify the '-d' flag for detached mode (the container will run in the background). +# You can also specify multiple services: # +# .. code:: bash +# +# docker-compose up -d mapdl dpf # -# USAGE - MAPDL LOCAL -# =================== -# It is said to be running as 'local' because it will mount the current directory in '/local' -# inside the container (presumably you will have the cloned repository in the current directory), -# and it will override the entrypoint to run the 'bash' command. +# Or use profiles: # -# 1. You need to have the 'mapdl' service running. You can do this by running the command: -# -# docker-compose up -d mapdl +# +# .. code:: bash +# +# docker-compose --profile dpf up -d # -# 2. Once you have done this, you can start the service by running: +# The following profiles are are available: # -# docker-compose -f d mapdl-local +# - ``mapdl`` - Equivalent to run ``docker-compose up -d mapdl``. +# - ``mapdl-dpf`` - Equivalent to run ``docker-compose up -d mapdl dpf``. +# - ``local`` - Equivalent to run ``docker-compose up -d mapdl-local``. +# - ``local-dpf`` - Equivalent to run ``docker-compose up -d mapdl-local dpf``. +# - ``dpf`` - Equivalent to run ``docker-compose up -d dpf``. # -# 3. you can run together by : -# -# docker-compose -up -d mapdl mapdl-local +# Optionally, you can specify the '-d' flag for detached mode (the container will run in the background). # # NOTES # ===== # -# - If you need to run a license server, please have a look at 'docker-compose.license_server.yml' -# file. In that case, the command to launch everything is: -# -# docker-compose -f docker-compose.yml -f docker-compose.license-server.yml -f docker-compose.local.yml up -# -# NOTES: -# ====== -# -# - `AWP_ROOT222` is where Ansys is installed. -# - The entrypoint must be defined in the Docker image. -# - If you want to mount the local directory, please add the 'volumes' section to the 'mapdl' service. -# -# volumes: -# - ./:/local +# - ``AWP_ROOT222`` is where Ansys 2022 R1 (v222) is installed. # services: mapdl: + profiles: + - mapdl + - mapdl-dpf restart: always shm_size: '8gb' container_name: mapdl @@ -89,15 +92,18 @@ services: environment: - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} - ANSYS_LOCK=OFF - - AWP_ROOT222=/ansys_inc + - ${AWP_ROOT:-AWP_ROOT222}=${AWP_ROOT_VALUE:-/ansys_inc} ports: - '50052:50052' - '50055:50055' image: ${DOCKER_IMAGE} - user: "0:0" entrypoint: "/bin/bash ansys -grpc" dpf: + profiles: + - dpf + - mapdl-dpf + - local-dpf image: ${DPF_DOCKER_IMAGE} ports: - '50056:50052' @@ -106,8 +112,22 @@ services: - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} mapdl-local: - user: "0:0" + profiles: + - local + - local-dpf + restart: always + shm_size: '8gb' + container_name: mapdl-local + mem_reservation: 8g + environment: + - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE} + - ANSYS_LOCK=OFF + - ${AWP_ROOT:-AWP_ROOT222}=${AWP_ROOT_VALUE:-/ansys_inc} + ports: + - '50052:50052' + - '50055:50055' + image: ${DOCKER_IMAGE} volumes: - - ./:/local:cached - # Overwriting entrypoint + - ../:/home/${DOCKER_USER:-mapdl}/pymapdl:cached + working_dir: /home/${DOCKER_USER:-mapdl}/pymapdl entrypoint: /bin/sh -c "echo 'Container is ready. You can now attach to it.'; while sleep 1000; do :; done" From 1ee7d9619351f453b0c465f57efd3702fa4dcfad Mon Sep 17 00:00:00 2001 From: Revathy Venugopal <104772255+Revathyvenugopal162@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:30:17 +0200 Subject: [PATCH 8/9] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 873260f320..7ae4566255 100755 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,6 @@ docker/mapdl/v211 docker/mapdl/v212 docker/mapdl/_old docker/mapdl/*.sh -distributions/ # temp testing From b6795249b2562b28c29c6e34057effbbca1a75fe Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot Date: Tue, 18 Jun 2024 11:38:02 +0000 Subject: [PATCH 9/9] Adding changelog entry: 3169.miscellaneous.md --- doc/changelog.d/3169.miscellaneous.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/3169.miscellaneous.md diff --git a/doc/changelog.d/3169.miscellaneous.md b/doc/changelog.d/3169.miscellaneous.md new file mode 100644 index 0000000000..99324c2f8b --- /dev/null +++ b/doc/changelog.d/3169.miscellaneous.md @@ -0,0 +1 @@ +fix: combine the `docker-compose` files \ No newline at end of file