Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Midren committed Nov 13, 2021
1 parent ecceaa8 commit 2680305
Show file tree
Hide file tree
Showing 5 changed files with 310 additions and 13,469 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN wget \
RUN conda update conda -y \
&& conda config --add channels conda-forge \
&& conda install pyfmi -y
RUN conda install matplotlib>=2.0.2 numpy>=1.16.6 pandas>=0.20.3 python-dateutil>=2.6.1 scikit-learn>=0.18.2 sphinx>=1.6.3 numpydoc>=0.7.0 pyDOE>=0.3.8 netCDF4==1.4.2 cftime==1.0.4.2 siphon==0.8.0 -y
RUN conda install matplotlib numpy pandas python-dateutil scikit-learn sphinx numpydoc -y
RUN conda install jupyter jupyter_contrib_nbextensions jupyterthemes -y

RUN mkdir -p /home/developer/.jupyter && jupyter notebook --generate-config
Expand Down Expand Up @@ -68,7 +68,8 @@ RUN for deb in deb deb-src; do echo "$deb http://build.openmodelica.org/apt `lsb
sudo apt update -y && \
sudo apt install -y openmodelica omlib-modelica-3.2.3

RUN pip3 install ompython
#RUN pip3 install ompython
RUN python3 -m pip install -U https://github.com/OpenModelica/OMPython/archive/master.zip

ENV USER developer
ENV DISPLAY :0.0
15 changes: 8 additions & 7 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ USER root
RUN apt-get update -y \
&& apt install -y ca-certificates

# add newer npm
RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh \
&& chmod +x nodesource_setup.sh \
&& ./nodesource_setup.sh

RUN apt-get update -y \
&& apt-get install -y software-properties-common \
&& add-apt-repository -y ppa:neovim-ppa/unstable \
&& apt-get update -y \
&& apt-get install -y sudo git lua5.1 python3-dev cmake nodejs locales \
&& apt-get install -y sudo git lua5.1 python3-dev python3-venv cmake nodejs locales curl \
&& apt-get install -y silversearcher-ag global clang-format ctags neovim zsh tmux \
&& apt upgrade -y \
&& apt-get clean

# add newer npm
RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh \
&& chmod +x nodesource_setup.sh \
&& ./nodesource_setup.sh \
&& apt-get install nodejs -y


# install ripgrep
RUN curl -LO https://github.com/BurntSushi/ripgrep/releases/download/12.1.1/ripgrep_12.1.1_amd64.deb \
&& sudo dpkg -i ripgrep_12.1.1_amd64.deb
Expand Down Expand Up @@ -48,7 +50,6 @@ RUN git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf \
&& mkdir -p ~/.local/bin \
&& mv ~/.fzf/bin/fzf ~/.local/bin/

ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
RUN git clone https://github.com/Midren/dotfiles ~/.dotfiles && \
~/.dotfiles/install-profile ubuntu-cli

Expand Down
69 changes: 45 additions & 24 deletions notebooks/Forecasting.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit 2680305

Please sign in to comment.