Skip to content

Commit fb77753

Browse files
committed
Update to 3.6.8 and attempt inclusion of McStas 1.12c...
1 parent 40c790b commit fb77753

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM quay.io/jupyter/base-notebook:2026-02-23
22

33
USER root
44

5-
RUN apt-get -y -qq update && apt-get -y -qq install software-properties-common && add-apt-repository ppa:mozillateam/ppa \
5+
RUN echo deb [trusted=yes] https://packages.mccode.org/debian stable main > /etc/apt/sources.list.d/mccode.list \
6+
&& apt-get -y -qq update && apt-get -y -qq install software-properties-common && add-apt-repository ppa:mozillateam/ppa \
67
&& echo 'Package: *' > /etc/apt/preferences.d/mozilla-firefox \
78
&& echo Pin: release o=LP-PPA-mozillateam >> /etc/apt/preferences.d/mozilla-firefox \
89
&& echo Pin-Priority: 1001 >> /etc/apt/preferences.d/mozilla-firefox \
@@ -26,6 +27,8 @@ RUN apt-get -y -qq update && apt-get -y -qq install software-properties-common &
2627
octave \
2728
git \
2829
firefox \
30+
mcstas-suite-python-legacy \
31+
mcstas-suite-perl-legacy \
2932
# Disable the automatic screenlock since the account password is unknown
3033
&& apt-get -y -qq remove xfce4-screensaver \
3134
# chown $HOME to workaround that the xorg installation creates a
@@ -36,6 +39,10 @@ RUN apt-get -y -qq update && apt-get -y -qq install software-properties-common &
3639
&& apt-get -y -qq clean \
3740
&& rm -rf /var/lib/apt/lists/*
3841

42+
# Build McStas 1.12c
43+
RUN wget http://download.mcstas.org/mcstas-1.x/mcstas-1.12c-src.tar.gz && tar xzf mcstas-1.12c-src.tar.gz && cd mcstas-1.12c \
44+
&& ./configure --prefix=/usr/local/mcstas-1.12c && make && make install && cd - && rm -rf mcstas-1.12c
45+
3946
# Install a VNC server, either TigerVNC (default) or TurboVNC
4047
ARG vncserver=tigervnc
4148
RUN if [ "${vncserver}" = "tigervnc" ]; then \

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66
- websockify
77
- jupytext
88
- nodejs
9-
- mcstas=3.5.32
10-
- mcxtrace=3.5.32
9+
- mcstas=3.6.8
10+
- mcxtrace=3.6.8
1111
- mccode-antlr
1212
- mcstasscript
1313
- rsync

0 commit comments

Comments
 (0)