Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
685390f
Bump tar from 6.1.7 to 6.2.1 in /frontend/v1
dependabot[bot] Apr 11, 2024
78911e6
Bump idna from 2.8 to 3.7
dependabot[bot] Apr 11, 2024
4e7825b
Bump dnspython from 1.16.0 to 2.6.1
dependabot[bot] Apr 12, 2024
1d46d92
Bump eventlet from 0.31.0 to 0.35.2
dependabot[bot] Apr 12, 2024
1c53da0
Bump werkzeug from 3.0.1 to 3.0.3
dependabot[bot] May 6, 2024
0130d97
Bump jinja2 from 3.1.3 to 3.1.4
dependabot[bot] May 6, 2024
db09b38
dependabot[bot] May 21, 2024
20dd316
Bump braces, webpack and webpack-cli in /frontend/v1
dependabot[bot] Jun 11, 2024
3b18e18
Bump urllib3 from 1.26.18 to 1.26.19
dependabot[bot] Jun 18, 2024
f5964af
Bump certifi from 2023.7.22 to 2024.7.4
dependabot[bot] Jul 6, 2024
d39a275
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/frontend…
dakotablair Jul 18, 2024
0809bcc
Merge remote-tracking branch 'origin/dependabot/pip/certifi-2024.7.4'…
dakotablair Jul 18, 2024
2aa039f
Merge remote-tracking branch 'origin/dependabot/pip/dnspython-2.6.1' …
dakotablair Jul 18, 2024
b91d4b8
Merge remote-tracking branch 'origin/dependabot/pip/eventlet-0.35.2' …
dakotablair Jul 18, 2024
779c585
Merge remote-tracking branch 'origin/dependabot/pip/idna-3.7' into de…
dakotablair Jul 18, 2024
7d5a5a4
Merge remote-tracking branch 'origin/dependabot/pip/jinja2-3.1.4' int…
dakotablair Jul 18, 2024
bf02a7b
Merge remote-tracking branch 'origin/dependabot/pip/requests-2.32.0' …
dakotablair Jul 18, 2024
216ba49
Merge remote-tracking branch 'origin/dependabot/pip/urllib3-1.26.19' …
dakotablair Jul 18, 2024
324edb4
Merge remote-tracking branch 'origin/dependabot/pip/werkzeug-3.0.3' i…
dakotablair Jul 18, 2024
0d4eb34
Added docker/Dockerfile.local to test dependency upgrades.
dakotablair Aug 16, 2024
3043031
Accept all dependabot suggestions.
dakotablair Aug 19, 2024
3e426a4
Revert dependencies based on latest support.
dakotablair Aug 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions docker/Dockerfile.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM ubuntu:18.04

RUN echo v0.0.0
RUN apt update
RUN apt install -y less vim
RUN DEBIAN_FRONTEND=noninteractive apt install -y \
build-essential \
ca-certificates \
coreutils \
curl \
environment-modules \
gfortran \
git \
gpg \
lsb-release \
# pkg-config \
# python3 installs python 3.6.9
python3 \
python3-distutils \
unzip \
zip

RUN git clone -c feature.manyFiles=true https://github.com/spack/spack.git
RUN git clone https://github.com/mochi-hpc/mochi-spack-packages.git
COPY docker/install_spack_requirements.sh /install_spack_requirements.sh
RUN bash /install_spack_requirements.sh

COPY requirements.large.txt /requirements.large.txt
COPY docker/install_python_requirements.large.sh /install_python_requirements.large.sh
RUN bash /install_python_requirements.large.sh

COPY requirements.txt /requirements.txt
COPY docker/install_python_requirements.sh /install_python_requirements.sh
RUN bash /install_python_requirements.sh
6 changes: 6 additions & 0 deletions docker/install_python_requirements.large.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -x
source /spack/share/spack/setup-env.sh
cd /opt/cv2
spack env activate .
python3.8 -m pip install -r /requirements.large.txt
8 changes: 8 additions & 0 deletions docker/install_python_requirements.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
set -x
source /spack/share/spack/setup-env.sh
cd /opt/cv2
spack env activate .
python3.8 -m pip install -r /requirements.txt
python3.8 -m pip install "pip==24" pkgconfig setuptools wheel --upgrade
python3.8 -m pip install git+https://github.com/mochi-hpc/py-mochi-sonata.git@v0.1.2
22 changes: 22 additions & 0 deletions docker/install_spack_requirements.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env bash
set -x
source /spack/share/spack/setup-env.sh
spack repo add mochi-spack-packages
mkdir -p /opt/cv2
cd /opt/cv2
spack env create --with-view view --dir .
spack env activate .
spack -e . add mochi-margo
spack -e . add mochi-sonata
spack -e . add mpich
spack -e . add "python@3.8.18"
spack -e . add py-mochi-margo # requires python3.11?
spack -e . add py-pip
# spack -e . add py-setuptools
spack -e . concretize
spack -e . install

# python3.11 -m pip install setuptools
# spack -e . add py-mochi-sonata
# spack -e . concretize
# spack -e . install
Loading