From 5543e9496d08da96512ba29885026c00d2d9aefa Mon Sep 17 00:00:00 2001
From: ben0i0d <ben0i0d@foxmail.com>
Date: Fri, 18 Oct 2024 16:06:16 +0800
Subject: [PATCH] repair fortran

---
 .gitea/workflows/Flow.yaml | 14 +++++++++++++-
 Program/cpp/Dockerfile     |  2 +-
 Program/fortran/.condarc   |  7 +++++++
 Program/fortran/Dockerfile | 25 ++++++++++++++++++++-----
 Program/haskell/Dockerfile |  4 ++--
 Program/lua/Dockerfile     |  2 +-
 6 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 Program/fortran/.condarc

diff --git a/.gitea/workflows/Flow.yaml b/.gitea/workflows/Flow.yaml
index 592df5a..31cd123 100644
--- a/.gitea/workflows/Flow.yaml
+++ b/.gitea/workflows/Flow.yaml
@@ -154,6 +154,18 @@ jobs:
           context: Program/cpp
           tags: eoelab.org:1027/${{ gitea.repository }}:cpp
 
+  FORTRAN:
+    runs-on: runner
+    needs: Base
+    steps:
+      - name: checkout code
+        uses: https://eoelab.org:1027/actions/checkout@v4
+      - name: fortran build
+        uses: https://eoelab.org:1027/actions/build-push-action@v6
+        with:
+          context: Program/fortran
+          tags: eoelab.org:1027/${{ gitea.repository }}:fortran
+
   HASKELL:
     runs-on: runner
     needs: Base
@@ -337,7 +349,7 @@ jobs:
 
   Push:
     runs-on: runner
-    needs: [CHAPEL,JAVA] # MATLAB_MCM, MAPLE, MMA
+    needs: [FORTRAN] # MATLAB_MCM, MAPLE, MMA
     steps:
       - name: login gitea_registry
         uses: https://eoelab.org:1027/actions/login-action@v3
diff --git a/Program/cpp/Dockerfile b/Program/cpp/Dockerfile
index 7045e0a..d7b91a4 100644
--- a/Program/cpp/Dockerfile
+++ b/Program/cpp/Dockerfile
@@ -8,7 +8,7 @@ USER root
 
 RUN apt-get update --yes && apt-get install --yes wget && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
-    wget https://eoelab.org:1027/ben0i0d/sources/raw/commit/ebbcba790d7b1804efde0715592a0665f6b81fbd/micromamba && \
+    wget https://eoelab.org:1027/ben0i0d/sources/raw/branch/main/micromamba && \
     chmod +x micromamba && \
     ./micromamba install --yes --root-prefix /opt/mamba xeus-cling -c conda-forge && \
     ./micromamba clean --yes --all
diff --git a/Program/fortran/.condarc b/Program/fortran/.condarc
new file mode 100644
index 0000000..ce6306d
--- /dev/null
+++ b/Program/fortran/.condarc
@@ -0,0 +1,7 @@
+channels:
+  - defaults
+show_channel_urls: true
+default_channels:
+  - https://mirrors.ustc.edu.cn/anaconda/pkgs/main
+custom_channels:
+  conda-forge: https://mirrors.ustc.edu.cn/anaconda/cloud
\ No newline at end of file
diff --git a/Program/fortran/Dockerfile b/Program/fortran/Dockerfile
index 2a34183..d70d280 100644
--- a/Program/fortran/Dockerfile
+++ b/Program/fortran/Dockerfile
@@ -1,8 +1,23 @@
-FROM eoelab.org:1027/ben0i0d/jupyter:py-c
+FROM eoelab.org:1027/ben0i0d/jupyter:py-c AS builder
+
+ENV MAMBA_ROOT_PREFIX=/opt/mamba
+
+COPY .condarc /opt/mamba/.condarc
 
 USER root
-# Install fortran kernel
-RUN mamba install --yes -c conda-forge lfortran && \
-    mamba clean --all -f -y  && \
 
-USER ${NB_UID}
+RUN apt-get update --yes && apt-get install --yes wget && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    wget https://eoelab.org:1027/ben0i0d/sources/raw/branch/main/micromamba && \
+    chmod +x micromamba && \
+    ./micromamba install --yes --root-prefix /opt/mamba lfortran -c conda-forge && \
+    ./micromamba clean --yes --all
+
+
+FROM eoelab.org:1027/ben0i0d/jupyter:py-c
+
+COPY --chown="${NB_UID}:${NB_GID}" --from=builder /opt/mamba /opt/mamba
+
+ENV PATH="/opt/mamba/bin:${PATH}"
+
+USER ${NB_UID}
\ No newline at end of file
diff --git a/Program/haskell/Dockerfile b/Program/haskell/Dockerfile
index b6452e0..de3f868 100644
--- a/Program/haskell/Dockerfile
+++ b/Program/haskell/Dockerfile
@@ -14,9 +14,9 @@ COPY config.yaml /etc/stack/config.yaml
 RUN apt-get update && apt-get install --yes haskell-stack git g++ wget libtinfo-dev libzmq3-dev libcairo2-dev libpango1.0-dev libmagic-dev libblas-dev liblapack-dev && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     wget -O /etc/stack/global-hints-cache.yaml https://mirrors.ustc.edu.cn/stackage/stackage-content/stack/global-hints.yaml && \
-    mkdir -p /opt/stack && 
+    mkdir -p /opt/stack && \
     git clone --depth 1 https://eoelab.org:1027/mirrors/IHaskell.git && \
-    cd IHaskell && sed -i 's/github.com\/codedownio/eoelab.org:1027\/mirrors/g' IHaskell/stack.yaml && \
+    cd IHaskell && sed -i 's/github.com\/codedownio/eoelab.org:1027\/mirrors/g' stack.yaml && \
     # Build IHaskell
     stack install --fast --local-bin-path=/usr/local/bin
 
diff --git a/Program/lua/Dockerfile b/Program/lua/Dockerfile
index a2c7ec3..02ff88d 100644
--- a/Program/lua/Dockerfile
+++ b/Program/lua/Dockerfile
@@ -8,7 +8,7 @@ USER root
 
 RUN apt-get update --yes && apt-get install --yes wget && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
-    wget https://eoelab.org:1027/ben0i0d/sources/raw/commit/ebbcba790d7b1804efde0715592a0665f6b81fbd/micromamba && \
+    wget https://eoelab.org:1027/ben0i0d/sources/raw/branch/main/micromamba && \
     chmod +x micromamba && \
     ./micromamba install --yes --root-prefix /opt/mamba xeus-lua -c conda-forge && \
     ./micromamba clean --yes --all