Skip to content

Commit

Permalink
Add octaverc.m to the container. Downgrade sympy to 1.5.1.
Browse files Browse the repository at this point in the history
Fixes #17
  • Loading branch information
sffc committed Jul 6, 2020
1 parent 4215d6b commit 9729e1a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -51,7 +51,7 @@ install-selinux-bin:
ln -sf $$PWD /usr/local/share/oo

install-site-m:
cp back-octave/octaverc.m /usr/local/share/octave/site/m/startup/octaverc
echo "This command is no longer supported. See containers/octave-pkg/Dockerfile."

enable-graceful-shutdown:
cp entrypoint/oo-no-restart.service /usr/lib/systemd/system/oo.service;
Expand Down
7 changes: 5 additions & 2 deletions containers/octave-pkg/Dockerfile
Expand Up @@ -37,7 +37,9 @@ RUN yum install -y \
netcdf-devel \
python3-pip

RUN pip3 install sympy
# TODO: install version 1.5.1 until the symbolic package is fixed:
# https://github.com/cbm755/octsympy/issues/1023
RUN pip3 install sympy==1.5.1

ARG PKG_BASE_URL=https://downloads.sourceforge.net/project/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases

Expand Down Expand Up @@ -149,4 +151,5 @@ RUN cd /usr/local/share/octave/site/m && /usr/local/bin/octave -q --eval "\
endfor; \
save('package_metadata.mat', 'packages'); "

# TODO: Add octaverc.m to the Docker image, and remove it from install-site-m
# Install site octaverc.m (formerly part of "install-site-m" in Makefile)
COPY containers/octave-pkg/octaverc.m /usr/local/share/octave/site/m/startup/octaverc
10 changes: 4 additions & 6 deletions back-octave/octaverc.m → containers/octave-pkg/octaverc.m
Expand Up @@ -50,21 +50,19 @@ function clear (varargin)
% Packages that are installed but not auto-loaded have a reason, such as shadows.

pkg load control;
pkg load dataframe;
pkg load general;
pkg load geometry;
pkg load image;
pkg load interval;
pkg load linear-algebra;
pkg load miscellaneous;
pkg load mvn;
pkg load signal;
pkg load struct;
pkg load symbolic;

% TODO: Save this file as part of the Dockerfile, then enable these pkgs:
% pkg load dataframe;
% pkg load mvn;
% pkg load tablicious;
% pkg load video;
pkg load tablicious;
pkg load video;

% Packages not auto-loaded because of the JVM dependency:
% pkg load data-smoothing;
Expand Down

0 comments on commit 9729e1a

Please sign in to comment.