update dockerfile to point back to master

add binary_c_install_legacy to docs

doc/binary_c2.lyx

@@ -4827,6 +4827,115 @@ src
 to function.
 \end_layout
 
+\begin_layout Subsubsection
+Building 
+\begin_inset Formula $\binaryc$
+\end_inset
+
+ and 
+\begin_inset Formula $\libbinaryc$
+\end_inset
+
+, and installing them for 
+\begin_inset Formula $\binarygrid2$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+You can build and install both 
+\begin_inset Formula $\binaryc$
+\end_inset
+
+ and 
+\begin_inset Formula $\libbinaryc$
+\end_inset
+
+ in locations which are compatible with legacy builds and 
+\begin_inset Formula $\binarygrid2$
+\end_inset
+
+ with one command:
+\end_layout
+
+\begin_layout Standard
+\begin_inset listings
+lstparams "language=bash"
+inline false
+status open
+
+\begin_layout Plain Layout
+
+cd builddir
+\end_layout
+
+\begin_layout Plain Layout
+
+ninja binary_c_install_legacy
+\end_layout
+
+\end_inset
+
+This puts a copy of the 
+\begin_inset Flex File
+status open
+
+\begin_layout Plain Layout
+binary_c
+\end_layout
+
+\end_inset
+
+ executable in the root 
+\begin_inset Formula $\binaryc$
+\end_inset
+
+ directory, and copies the shared library file 
+\begin_inset Flex File
+status open
+
+\begin_layout Plain Layout
+libbinary_c.so
+\end_layout
+
+\end_inset
+
+ to the 
+\begin_inset Flex File
+status open
+
+\begin_layout Plain Layout
+src
+\end_layout
+
+\end_inset
+
+ directory, i.e.
+\begin_inset space ~
+\end_inset
+
+the locations 
+\begin_inset Formula $\binarygrid2$
+\end_inset
+
+ expects.
+\end_layout
+
+\begin_layout Standard
+After doing the above, you can remove the 
+\begin_inset Flex File
+status open
+
+\begin_layout Plain Layout
+builddir
+\end_layout
+
+\end_inset
+
+ completely.
+\end_layout
+
 \begin_layout Subsubsection
 Alternative compiler
 \end_layout

docker/Dockerfile

@@ -184,6 +184,13 @@ RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && meson builddir -D
 WORKDIR /home/binary_c/progs/stars/binary_c/builddir
 RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ninja binary_c_install_legacy
 
+############################################################
+# Clean up object files 
+############################################################
+
+WORKDIR /home/binary_c/progs/stars/binary_c
+RUN rm -rf builddir
+
 ############################################################
 # install perl modules for binary_grid
 ############################################################
@@ -233,13 +240,6 @@ USER root
 RUN rm -rf /var/lib/apt/lists/*
 USER binary_c
 
-############################################################
-# Clean up object files and remove .git from binary_c tree
-############################################################
-
-WORKDIR /home/binary_c/progs/stars/binary_c
-RUN rm -rf builddir
-
 ############################################################
 # Leave in /home/binary_c
 ############################################################

docker/build.sh

@@ -10,16 +10,17 @@
 WD=$PWD
 
 # set cache date to 'date ...' for a unique (non-cached build)
-#CACHE_DATE=$(date +%Y-%m-%d:%H:%M:%S)
-CACHE_DATE=today
+CACHE_DATE=$(date +%Y-%m-%d:%H:%M:%S) # default
+# or today to use the cache
+#CACHE_DATE=today
 
 # which git branch do we want?
-#GIT_BRANCH=master
-GIT_BRANCH=izzard-discs
+GIT_BRANCH=master # default
+#GIT_BRANCH=izzard-discs
 
 # TMPDIR is our temporary space : usually mktemp is good enough
 # but you may want to change this location manually
-TMPDIR=$(mktemp -d -t ci-XXXXXXXXXX)
+TMPDIR=$(mktemp -d -t ci-XXXXXXXXXX) # default
 
 ############################################################
 # get binary_c version string