repair chapel & java

This commit is contained in:
ben0i0d 2024-10-18 15:50:17 +08:00
parent 8b2196a72c
commit 956ea48798
4 changed files with 15 additions and 12 deletions

View File

@ -172,6 +172,11 @@ jobs:
steps:
- name: checkout code
uses: https://eoelab.org:1027/actions/checkout@v4
- name: java build
uses: https://eoelab.org:1027/actions/build-push-action@v6
with:
context: Program/java
tags: eoelab.org:1027/${{ gitea.repository }}:java
JS:
runs-on: runner
@ -332,7 +337,7 @@ jobs:
Push:
runs-on: runner
needs: [CHAPEL] # MATLAB_MCM, MAPLE, MMA
needs: [CHAPEL,JAVA] # MATLAB_MCM, MAPLE, MMA
steps:
- name: login gitea_registry
uses: https://eoelab.org:1027/actions/login-action@v3

View File

@ -5,7 +5,7 @@ USER root
WORKDIR /opt
RUN apt-get update --yes && apt-get install --yes --no-install-recommends wget && apt-get clean && rm -rf /var/lib/apt/lists/* && \
wget https://eoelab.org:1027/ben0i0d/sources/src/commit/a3cbcdd8551fa0bc27be0ae7e6d2d0aa5d997efe/chapel-2.2.0-1.debian12.amd64.deb
wget https://eoelab.org:1027/ben0i0d/sources/raw/branch/main/chapel-2.2.0-1.debian12.amd64.deb
FROM eoelab.org:1027/ben0i0d/jupyter:py-c
@ -15,7 +15,7 @@ USER root
COPY --from=builder /opt/chapel-2.2.0-1.debian12.amd64.deb /tmp/chapel-2.2.0-1.debian12.amd64.deb
RUN apt-get update --yes && \
apt-get install --yes /tmp/chapel-2.2.0-1.debian12.amd64.deb && rm /tmp/chapel-2.2.0-1.debian12.amd64.deb && \
apt-get install --yes --no-install-recommends /tmp/chapel-2.2.0-1.debian12.amd64.deb && rm /tmp/chapel-2.2.0-1.debian12.amd64.deb && \
apt-get clean && rm -rf /var/lib/apt/lists/*
USER ${NB_UID}

View File

@ -14,17 +14,14 @@ 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 && chown ${NB_UID}:${NB_GID} /opt/stack && \
mkdir -p /opt/stack &&
git clone --depth 1 https://eoelab.org:1027/mirrors/IHaskell.git && \
sed -i 's/github.com\/codedownio/eoelab.org:1027\/mirrors/g' IHaskell/stack.yaml && \
chown -R ${NB_UID}:${NB_GID} IHaskell
cd IHaskell && sed -i 's/github.com\/codedownio/eoelab.org:1027\/mirrors/g' IHaskell/stack.yaml && \
# Build IHaskell
stack install --fast --local-bin-path=/usr/local/bin
USER ${NB_UID}
# Build IHaskell
#RUN cd IHaskell && stack install --fast --local-bin-path=/usr/local/bin
# FROM eoelab.org:1027/ben0i0d/jupyter:py-c
# USER root

View File

@ -5,7 +5,7 @@ USER root
WORKDIR /opt
RUN apt-get update --yes && apt-get install --yes --no-install-recommends wget unzip && apt-get clean && rm -rf /var/lib/apt/lists/* && \
wget https://eoelab.org:1027/ben0i0d/sources/src/commit/e8631a5dce40bd0b134758f1aff4caca59c082fe/ijava-1.3.0.zip && \
wget https://eoelab.org:1027/ben0i0d/sources/raw/branch/main/ijava-1.3.0.zip && \
unzip ijava-1.3.0.zip -d IJava && rm ijava-1.3.0.zip
FROM eoelab.org:1027/ben0i0d/jupyter:py-c
@ -20,4 +20,5 @@ RUN apt update && apt install --yes --no-install-recommends openjdk-17-jdk && \
# install the kernel
USER $NB_USER
RUN cd /opt/IJava && python3 install.py --sys-prefix