Allow adding custom commands to Dockerfile's end

configs/ubuntu.sh

@@ -39,7 +39,7 @@ extra_packages="$extra_deb_packages"
 
 # Opam switch to use. This determines the OCaml version and a set of
 # configuration options.
-opam_switch="4.14.0"
+opam_switch="4.14.1"
 
 # The collection of opam packages we want to install. Go wild.
 opam_packages="$opam_packages"

docker-build

@@ -59,6 +59,7 @@ build() {
     cp -a src/os/"$os" tmp/os
     cp -a src/opam tmp
     cp -a src/create-dockerfile tmp
+    cp extra-docker-tail tmp/ -v
 
     extra_build_options=()
     for url in "${extra_docker_urls[@]}"; do
@@ -74,6 +75,7 @@ build() {
         --create-user "$user" \
         --extra-packages "$extra_packages" \
         --opam-packages "$opam_packages" \
+        --extra-docker-tail ./extra-docker-tail \
         --opam-switch "$opam_switch" \
         --opam-switch-options "$opam_switch_options"
       docker build -t "$docker_url" "${extra_build_options[@]}" .

extra-docker-tail

@@ -0,0 +1,10 @@
+RUN echo "Manual commands in the end"
+
+# Use the following to get a more compact image
+RUN du -sh ~/.opam
+RUN find $(opam var bin) -iname '*.byte' -exec rm -fv {} \;
+RUN find $(opam var bin) -iname 'ocamlformat.parser_recover.test*' -exec rm -f {} \;
+RUN find $(opam var lib) -iname '*.cmt' -exec rm -f {} \;
+RUN find $(opam var lib) -iname '*.cmti' -exec rm -f {} \;
+RUN find $(opam var prefix) -iname '*.exe' -exec strip {} \;
+RUN du -sh ~/.opam

src/create-dockerfile

@@ -85,6 +85,7 @@ from=''
 no_from=false
 create_user=''
 dockerfile=''
+extra_docker_tail=''
 extra_packages="$default_extra_packages"
 force_tag=''
 opam_packages="$default_opam_packages"
@@ -144,6 +145,10 @@ while [[ $# -gt 0 ]]; do
       opam_switch_options=$(echo $2)
       shift
     ;;
+    --extra-docker-tail)
+      extra_docker_tail=$(echo $2)
+      shift
+    ;;
     --os)
       os=$2
       case "$os" in
@@ -236,3 +241,9 @@ $([[ "$no_cmd" = true ]] || (echo; echo "CMD $cmd") )
 
 COPY Dockerfile /Dockerfile
 EOF
+
+if [ -z "$extra_docker_tail" ]; then
+	echo "No extra docker contents specified" 1>&2
+else
+  cat "$extra_docker_tail" >> $dockerfile
+fi