entrypoint and error message

Author: jschaul

Makefile

@@ -351,4 +351,4 @@ buildah:
 	mkdir -p .stack-root-buildah
 	mkdir -p .stack-work-buildah
 	mkdir -p dist-buildah
-	stack install . --local-bin-path=dist-buildah --work-dir=.stack-work-buildah --stack-root=${CURDIR}/.stack-root-buildah
+	stack install . --local-bin-path=dist-buildah --work-dir=.stack-work-buildah --stack-root=${CURDIR}/.stack-root-buildah --fast

build/alpine/buildah.sh

@@ -18,15 +18,37 @@ buildah containers | awk '{print $5}' | grep "$CONTAINER_NAME" \
 ls "$TOP_LEVEL/.stack-root-buildah/config.yaml" 2> /dev/null \
     || buildah run "$CONTAINER_NAME" -- cp -a /root/.stack/. /src/.stack-root-buildah/
 
-buildah run "$CONTAINER_NAME" -- make -C /src buildah
+# buildah run "$CONTAINER_NAME" -- make -C /src buildah
 
 #######
 
-CONTAINER_NAME="output"
 EXECUTABLE="cannon"
+CONTAINER_NAME="output"
 DOCKER_TAG=$USER
 
-buildah from --name "$CONTAINER_NAME" -v "${TOP_LEVEL}"/buildah-dist:/dist -v "${TOP_LEVEL}"/services/brig/deb/opt/brig/templates:/templates --pull quay.io/wire/alpine-deps:develop
-buildah run "$CONTAINER_NAME" -- cp "/dist/$EXECUTABLE" "/usr/bin/$EXECUTABLE"
-# buildah run "$CONTAINER_NAME" -- cp -r "/templates/." "/usr/share/wire/templates/"
+buildah containers | awk '{print $5}' | grep "$CONTAINER_NAME" \
+    || buildah from --name "$CONTAINER_NAME" -v "${TOP_LEVEL}":/src --pull quay.io/wire/alpine-deps:develop
+
+buildah run "$CONTAINER_NAME" -- sh -c 'mkdir -p /usr/share/wire/templates && cp -r "/src/services/brig/deb/opt/brig/templates" "/usr/share/wire/templates"'
+buildah run "$CONTAINER_NAME" -- cp "/src/dist/$EXECUTABLE" "/usr/bin/$EXECUTABLE"
+buildah config --entrypoint "[ \"/usr/bin/dumb-init\", \"--\", \"/usr/bin/$EXECUTABLE\" ]" "$CONTAINER_NAME"
 buildah commit "$CONTAINER_NAME" quay.io/wire/"$EXECUTABLE":"$DOCKER_TAG"
+
+# TODO HELP!
+# buldah push quay.io/wire/cannon:$USER works and uploads it to quay.io
+# also, inside the image, /usr/bin/cannon exists, is a 43 MB file, ldd shows it has the right linker libs, it's executable, but running /usr/bin/cannon leads to:
+#     sh: /usr/bin/cannon: not found
+# providing config files under /etc/wire/cannon/ doesn't help.
+
+
+# If the above works, continue with logic like the following:
+
+# buildah run "$CONTAINER_NAME" -- rm "/usr/bin/$EXECUTABLE"
+
+# loop: remove cannon, add new executable
+# for EX in brig cargohold galley; do
+#     buildah run "$CONTAINER_NAME" -- cp "/src/dist/$EX" "/usr/bin/$EX"
+#     buildah config --entrypoint "[ \"/usr/bin/dumb-init\", \"--\", \"/usr/bin/$EX\" ]" "$CONTAINER_NAME"
+#     buildah commit "$CONTAINER_NAME" quay.io/wire/"$EXECUTABLE":"$DOCKER_TAG"
+#     buildah run "$CONTAINER_NAME" -- rm "/usr/bin/$EX"
+# done