Skip to content

Commit b48ff0c

Browse files
fix: update Dockerfiles and docker-compose files to use v25.2-ubuntu-cicd and streamline environment variables (#3962)
* fix: update Dockerfiles and docker-compose files to use v25.2-ubuntu-cicd and streamline environment variables * chore: adding changelog file 3962.fixed.md [dependabot-skip] --------- Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent a57e269 commit b48ff0c

File tree

7 files changed

+12
-24
lines changed

7 files changed

+12
-24
lines changed

.devcontainer/codespaces-dev/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ansys/mapdl:v24.1-ubuntu-student
1+
FROM ghcr.io/ansys/mapdl:v25.2-ubuntu-cicd
22

33
ENV USERNAME=mapdl
44
USER root
@@ -7,6 +7,9 @@ USER root
77
ENV DEBIAN_FRONTEND=noninteractive
88
ENV ON_CODESPACES=true
99
ENV CODESPACES_MODE=dev
10+
ENV ON_LOCAL=true
11+
ENV ON_UBUNTU=true
12+
ENV ON_CI=true
1013

1114
# Installing libs for testing and docs
1215
RUN apt-get -qq update && apt install -qq -y

.devcontainer/codespaces-dev/docker-compose.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,9 @@ services:
77
# to avoid running issues. By Default this is very small (64MB)
88
container_name: PyMAPDL-Development
99
mem_reservation: 8g
10-
image: 'ghcr.io/ansys/mapdl:v24.1-ubuntu-student'
1110
build:
1211
dockerfile: Dockerfile
1312
context: .
14-
environment:
15-
# Env vars for testing
16-
- ON_CI=true
17-
- ON_LOCAL=true
18-
- ON_STUDENT=true
19-
- ON_UBUNTU=true
2013
volumes:
2114
# Update this to wherever you want VS Code to mount the folder of your project inside the container.
2215
- ../:/home/mapdl/pymapdl:cached

.devcontainer/codespaces-docs/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ansys/mapdl:v24.1-ubuntu-student
1+
FROM ghcr.io/ansys/mapdl:v25.2-ubuntu-cicd
22

33
ENV USERNAME=mapdl
44
USER root
@@ -7,6 +7,9 @@ USER root
77
ENV DEBIAN_FRONTEND=noninteractive
88
ENV ON_CODESPACES=true
99
ENV CODESPACES_MODE=docs
10+
ENV ON_LOCAL=true
11+
ENV ON_UBUNTU=true
12+
ENV ON_CI=true
1013

1114
# Installing libs for testing and docs
1215
RUN apt-get -qq update && apt install -qq -y \

.devcontainer/codespaces-docs/docker-compose.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,9 @@ services:
77
# to avoid running issues. By Default this is very small (64MB)
88
container_name: PyMAPDL-Development
99
mem_reservation: 8g
10-
image: 'ghcr.io/ansys/mapdl:v24.1-ubuntu-student'
1110
build:
1211
dockerfile: Dockerfile
1312
context: .
14-
environment:
15-
# Env vars for testing
16-
- ON_CI=true
17-
- ON_LOCAL=true
18-
- ON_STUDENT=true
19-
- ON_UBUNTU=true
2013
volumes:
2114
# Update this to wherever you want VS Code to mount the folder of your project inside the container.
2215
- ../../:/home/mapdl/pymapdl:cached

.devcontainer/devcontainer-local/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ USER root
66
# General libraries
77
ENV DEBIAN_FRONTEND=noninteractive
88
ENV ON_CODESPACES=false
9+
ENV ON_LOCAL=true
10+
ENV ON_UBUNTU=true
11+
ENV ON_CI=true
912

1013
# Installing libs for testing and docs
1114
RUN apt-get -qq update && apt-get install -qq -y \

.devcontainer/devcontainer-local/docker-compose.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@ services:
77
shm_size: '2gb' # Increase the shared memory directory to avoid running issues. By Default this is very small (64MB)
88
container_name: "PyMAPDL-Development" # this needs to be updated/unique if you want to have multiple containers
99
mem_reservation: 8g
10-
image: 'ghcr.io/ansys/mapdl:v24.1-ubuntu-student'
1110
build:
1211
dockerfile: Dockerfile
1312
context: .
14-
environment:
15-
# Env vars for testing
16-
- ON_CI=true
17-
- ON_LOCAL=true
18-
- ON_STUDENT=true
19-
- ON_UBUNTU=true
2013
volumes:
2114
# Update this to wherever you want VS Code to mount the folder of your project inside the container.
2215
- ../../:/home/mapdl/pymapdl:cached
2316

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

doc/changelog.d/3962.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fix: update Dockerfiles and docker-compose files to use v25.2-ubuntu-cicd and streamline environment variables

0 commit comments

Comments
 (0)