Skip to content
Snippets Groups Projects
Commit 7b042bf9 authored by jurgenhaas's avatar jurgenhaas
Browse files

Incorporate changes from @jceb's review

parent 4a5030b3
No related branches found
No related tags found
No related merge requests found
......@@ -23,8 +23,8 @@ RUN echo "Adding system components" && \
ADD bin/* /usr/local/bin/
RUN echo "Setup MdShow" && \
mdshow setup && \
RUN echo "Setup mdshow" && \
mdshow setup CONFIG_PATH=/opt && \
ln -s /opt/mdshow/reveal.js/node_modules/gulp/bin/gulp.js /usr/bin/gulp && \
mkdir -p /opt/mdshow/theme && \
chmod -R a+rwx /opt/mdshow && \
......@@ -40,5 +40,6 @@ RUN echo "Setup MdShow" && \
rm -rf /root/.npm && \
echo "Completed"
WORKDIR /mdshow
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["/bin/bash"]
#!/bin/sh
#!/bin/bash
set -e
set -u
# first arg is `-f` or `--some-option`
if [ "${1#-}" != "$1" ]; then
......
......@@ -7,7 +7,9 @@
SHELL := /bin/bash
MDSHOW_CONFIG = /opt/mdshow
CONFIG_PATH = ${HOME}/.config
MDSHOW_CONFIG = $(CONFIG_PATH)/mdshow
SLIDES = slides.md
BUILD_DIR = .build_$(basename $(SLIDES))
PORT = 3000
......
......@@ -4,4 +4,4 @@ if [[ -n $MDSHOW_THEME_PATH ]]; then
THEME=--volume=${MDSHOW_THEME_PATH}:/opt/mdshow/theme/$(basename ${MDSHOW_THEME_PATH})
fi
docker run --user=$(id -u) --rm -it --net=host ${THEME} --volume=$(pwd):/mdshow --workdir=/mdshow registry.lakedrops.com/docker/mdshow mdshow $@
docker run --user=$(id -u) --rm -it --net=host ${THEME} --volume=$(pwd):/mdshow registry.lakedrops.com/docker/mdshow mdshow CONFIG_PATH=/opt $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment