Skip to content

Commit bbc95ce

Browse files
authored
Merge pull request ITHACA-FV#615 from giovastabile/update_submodules
changed makefiles and dockerfile amd
2 parents c5a24ea + 4980dfb commit bbc95ce

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

dockerfiles/OF2412/Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,5 @@ clean:
55
build:
66
docker build -t ithacafv/openfoam2412-muq2-pytorch -f ./Dockerfile .
77

8-
run: build
9-
xhost +"local:docker" && \
10-
docker run -ti --rm \
11-
-v "${HOME}:/home/${ME}" \
12-
-e DISPLAY=${DISPLAY} \
13-
--security-opt seccomp=unconfined \
14-
ubuntu-apc
15-
16-
8+
run:
9+
docker run -it ithacafv/openfoam2412-muq2-pytorch bash

dockerfiles/OF2506/Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,5 @@ clean:
55
build:
66
docker build -t ithacafv/openfoam2506-muq2-pytorch -f ./Dockerfile .
77

8-
run: build
9-
xhost +"local:docker" && \
10-
docker run -ti --rm \
11-
-v "${HOME}:/home/${ME}" \
12-
-e DISPLAY=${DISPLAY} \
13-
--security-opt seccomp=unconfined \
14-
ubuntu-apc
15-
16-
8+
run:
9+
docker run -it ithacafv/openfoam2506-muq2-pytorch bash

dockerfiles/amd64/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM opencfd/openfoam2106-dev
2-
LABEL maintainer="[email protected]"
1+
FROM ithacafv/openfoam2506-muq2-pytorch
2+
LABEL maintainer="[email protected]"
33

44

55
# add enviromental variables and enable the default user
66
ARG USER=ithacafv
7-
ARG of_var="source /usr/lib/openfoam/openfoam2106/etc/bashrc"
7+
ARG of_var="source /usr/lib/openfoam/openfoam2506/etc/bashrc"
88
ARG ithaca_var="source /usr/lib/ITHACA-FV/etc/bashrc"
99
ENV USER $USER
1010

@@ -33,18 +33,18 @@ RUN apt-get update &&\
3333
sudo rm -rf /var/lib/apt/lists/*
3434

3535
WORKDIR /usr/lib
36-
RUN git clone https://github.com/mathLab/ITHACA-FV.git
36+
RUN git clone https://github.com/ithacafv/ITHACA-FV.git
3737
RUN chown -R $USER:$USER openfoam ITHACA-FV
3838
RUN chown -R $USER:$USER /home/$USER
3939
USER $USER
4040

41-
RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2106/etc/bashrc && \
41+
RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2506/etc/bashrc && \
4242
cd ITHACA-FV && git submodule update --init && source /etc/bash.bashrc && \
43-
./Allwmake -tau -j 4";
43+
./Allwmake -taumq -j 4";
4444

4545
USER root
46-
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2106/platforms/linux64GccDPInt32Opt/bin/* /bin/
47-
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2106/platforms/linux64GccDPInt32Opt/lib/* /lib/
46+
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2506/platforms/linux64GccDPInt32Opt/bin/* /bin/
47+
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2506/platforms/linux64GccDPInt32Opt/lib/* /lib/
4848

4949
#Update bashrc
5050
RUN echo $of_var >> /etc/bash.bashrc

0 commit comments

Comments
 (0)