Skip to content

Commit 52d03d9

Browse files
authored
Merge pull request ITHACA-FV#617 from giovastabile/update_submodules
FIX: fixed dockerfiles for ithaca amd
2 parents 825af82 + 0749a6e commit 52d03d9

1 file changed

Lines changed: 34 additions & 33 deletions

File tree

dockerfiles/amd64/Dockerfile

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ FROM ithacafv/openfoam2506-muq2-pytorch
22
LABEL maintainer="giovannistabile@santannapisa.it"
33

44

5-
# add enviromental variables and enable the default user
6-
ARG USER=ithacafv
7-
ARG of_var="source /usr/lib/openfoam/openfoam2506/etc/bashrc"
5+
# # add enviromental variables and enable the default user
6+
# ARG USER=ithacafv
7+
# ARG of_var="source /usr/lib/openfoam/openfoam2506/etc/bashrc"
88
ARG ithaca_var="source /usr/lib/ITHACA-FV/etc/bashrc"
9-
ENV USER=$USER
10-
11-
# Create the user
12-
RUN adduser --disabled-password --gecos '' $USER && \
13-
adduser $USER sudo; echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
14-
usermod -a -G $USER $USER && \
15-
usermod -u 9999 ithacafv && \
16-
groupmod -g 9999 ithacafv
17-
#make sure everything is in place
18-
ENV HOME /home/$USER
19-
RUN chown -R $USER:$USER /home/$USER
20-
RUN chown -R $USER:$USER /home/openfoam && rm -r /home/openfoam && \
21-
chown -R $USER:$USER /home/sudofoam && rm -r /home/sudofoam
22-
23-
USER root
9+
# ENV USER=$USER
10+
11+
# # Create the user
12+
# RUN adduser --disabled-password --gecos '' $USER && \
13+
# adduser $USER sudo; echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
14+
# usermod -a -G $USER $USER && \
15+
# usermod -u 9999 ithacafv && \
16+
# groupmod -g 9999 ithacafv
17+
# #make sure everything is in place
18+
# ENV HOME /home/$USER
19+
# RUN chown -R $USER:$USER /home/$USER
20+
# RUN chown -R $USER:$USER /home/openfoam && rm -r /home/openfoam && \
21+
# chown -R $USER:$USER /home/sudofoam && rm -r /home/sudofoam
22+
23+
# USER root
2424
RUN apt-get update &&\
2525
apt-get install -y \
2626
git \
@@ -33,27 +33,28 @@ RUN apt-get update &&\
3333

3434
WORKDIR /usr/lib
3535
RUN git clone https://github.com/ITHACA-FV/ITHACA-FV.git
36-
RUN chown -R $USER:$USER openfoam ITHACA-FV
37-
RUN chown -R $USER:$USER /home/$USER
38-
USER $USER
36+
# RUN chown -R $USER:$USER openfoam ITHACA-FV
37+
# RUN chown -R $USER:$USER /home/$USER
38+
# RUN chown -R $USER:$USER /root/miniconda3/include
39+
# USER $USER
3940

4041
RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2506/etc/bashrc && \
41-
cd ITHACA-FV && git submodule update --init && source /etc/bash.bashrc && \
42+
cd ITHACA-FV && git submodule update --init && source etc/bashrc && \
4243
./Allwmake -taumq -j 4";
4344

44-
USER root
45-
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2506/platforms/linux64GccDPInt32Opt/bin/* /bin/
46-
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2506/platforms/linux64GccDPInt32Opt/lib/* /lib/
45+
# USER root
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/
4748

4849
#Update bashrc
49-
RUN echo $of_var >> /etc/bash.bashrc
50-
RUN echo $ithaca_var >> /etc/bash.bashrc
50+
# RUN echo $of_var >> /etc/bash.bashrc
51+
RUN echo $ithaca_var >> /root/.bashrc
5152

52-
#Source bashrc
53-
USER $USER
54-
RUN /bin/bash -c "source /etc/bash.bashrc"
53+
# #Source bashrc
54+
# USER $USER
55+
# RUN /bin/bash -c "source /etc/bash.bashrc"
5556

56-
USER $USER
57-
WORKDIR $HOME
58-
ENTRYPOINT ["/bin/bash"]
57+
# USER $USER
58+
# WORKDIR $HOME
59+
# ENTRYPOINT ["/bin/bash"]
5960

0 commit comments

Comments
 (0)