Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .devcontainer/codespaces-dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/ansys/mapdl:v24.1-ubuntu-student
FROM ghcr.io/ansys/mapdl:v25.2-ubuntu-cicd

ENV USERNAME=mapdl
USER root
Expand All @@ -7,6 +7,9 @@ USER root
ENV DEBIAN_FRONTEND=noninteractive
ENV ON_CODESPACES=true
ENV CODESPACES_MODE=dev
ENV ON_LOCAL=true
ENV ON_UBUNTU=true
ENV ON_CI=true

# Installing libs for testing and docs
RUN apt-get -qq update && apt install -qq -y
Expand Down
7 changes: 0 additions & 7 deletions .devcontainer/codespaces-dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,9 @@ services:
# to avoid running issues. By Default this is very small (64MB)
container_name: PyMAPDL-Development
mem_reservation: 8g
image: 'ghcr.io/ansys/mapdl:v24.1-ubuntu-student'
build:
dockerfile: Dockerfile
context: .
environment:
# Env vars for testing
- ON_CI=true
- ON_LOCAL=true
- ON_STUDENT=true
- ON_UBUNTU=true
volumes:
# Update this to wherever you want VS Code to mount the folder of your project inside the container.
- ../:/home/mapdl/pymapdl:cached
Expand Down
5 changes: 4 additions & 1 deletion .devcontainer/codespaces-docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/ansys/mapdl:v24.1-ubuntu-student
FROM ghcr.io/ansys/mapdl:v25.2-ubuntu-cicd

ENV USERNAME=mapdl
USER root
Expand All @@ -7,6 +7,9 @@ USER root
ENV DEBIAN_FRONTEND=noninteractive
ENV ON_CODESPACES=true
ENV CODESPACES_MODE=docs
ENV ON_LOCAL=true
ENV ON_UBUNTU=true
ENV ON_CI=true

# Installing libs for testing and docs
RUN apt-get -qq update && apt install -qq -y \
Expand Down
7 changes: 0 additions & 7 deletions .devcontainer/codespaces-docs/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,9 @@ services:
# to avoid running issues. By Default this is very small (64MB)
container_name: PyMAPDL-Development
mem_reservation: 8g
image: 'ghcr.io/ansys/mapdl:v24.1-ubuntu-student'
build:
dockerfile: Dockerfile
context: .
environment:
# Env vars for testing
- ON_CI=true
- ON_LOCAL=true
- ON_STUDENT=true
- ON_UBUNTU=true
volumes:
# Update this to wherever you want VS Code to mount the folder of your project inside the container.
- ../../:/home/mapdl/pymapdl:cached
Expand Down
3 changes: 3 additions & 0 deletions .devcontainer/devcontainer-local/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ USER root
# General libraries
ENV DEBIAN_FRONTEND=noninteractive
ENV ON_CODESPACES=false
ENV ON_LOCAL=true
ENV ON_UBUNTU=true
ENV ON_CI=true

# Installing libs for testing and docs
RUN apt-get -qq update && apt-get install -qq -y \
Expand Down
8 changes: 0 additions & 8 deletions .devcontainer/devcontainer-local/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,12 @@ services:
shm_size: '2gb' # Increase the shared memory directory to avoid running issues. By Default this is very small (64MB)
container_name: "PyMAPDL-Development" # this needs to be updated/unique if you want to have multiple containers
mem_reservation: 8g
image: 'ghcr.io/ansys/mapdl:v24.1-ubuntu-student'
build:
dockerfile: Dockerfile
context: .
environment:
# Env vars for testing
- ON_CI=true
- ON_LOCAL=true
- ON_STUDENT=true
- ON_UBUNTU=true
volumes:
# Update this to wherever you want VS Code to mount the folder of your project inside the container.
- ../../:/home/mapdl/pymapdl:cached

# Overrides default command so things don't shut down after the process ends.
entrypoint: /bin/bash -c "while sleep 10000; do :; done"

1 change: 1 addition & 0 deletions doc/changelog.d/3962.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: update Dockerfiles and docker-compose files to use v25.2-ubuntu-cicd and streamline environment variables