Skip to content

Commit a8f1de6

Browse files
authored
Merge pull request ITHACA-FV#528 from moaadkhamlich/DockerFix
FIX: fixing arm64 Dockerfile
2 parents 791fbbc + eb7bd91 commit a8f1de6

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

dockerfiles/arm64/Dockerfile

+7-15
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ RUN apt-get update \
1111
software-properties-common ;\
1212
rm -rf /var/lib/apt/lists/*
1313

14-
# add enviromental variables
15-
ARG USER=ithacafv
16-
ARG of_var="source /usr/lib/openfoam/openfoam2106/etc/bashrc"
17-
ARG ithaca_var="source /usr/lib/ITHACA-FV/etc/bashrc"
18-
1914
# add and enable the default user
15+
ARG USER=ithacafv
16+
ARG of_var="source /opt/OpenFOAM-v2106/etc/bashrc"
17+
ARG ithaca_var="source /opt/ITHACA-FV/etc/bashrc"
2018
RUN adduser --disabled-password --gecos '' $USER
2119
RUN adduser $USER sudo; echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
2220

@@ -29,22 +27,16 @@ USER $USER
2927
ENV HOME /home/$USER
3028
ENV USER $USER
3129

32-
RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2106/etc/bashrc && \
33-
cd ITHACA-FV && git submodule update --init && source /etc/bash.bashrc && \
34-
./Allwmake -tau -j 4";
30+
RUN /bin/bash -c "source OpenFOAM-v2106/etc/bashrc && \
31+
cd ITHACA-FV && git submodule update --init && source etc/bashrc && \
32+
./Allwmake -au -j 4";
3533

36-
USER root
37-
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2106/platforms/linux64GccDPInt32Opt/bin/* /bin/
38-
RUN cp -r /home/ithacafv/OpenFOAM/ithacafv-v2106/platforms/linux64GccDPInt32Opt/lib/* /lib/
39-
40-
41-
#Update bashrc
34+
#Update bashrc
4235
RUN echo $of_var >> /etc/bash.bashrc
4336
RUN echo $ithaca_var >> /etc/bash.bashrc
4437

4538
#Source bashrc
4639
RUN /bin/bash -c "source /etc/bash.bashrc"
4740

48-
USER $USER
4941
WORKDIR $HOME
5042
ENTRYPOINT ["/bin/bash"]

0 commit comments

Comments
 (0)