Skip to content
Snippets Groups Projects
Commit 27a026ca authored by jurgenhaas's avatar jurgenhaas
Browse files

Incorporate changes from @jceb's review

parent 4a5030b3
Branches
Tags
No related merge requests found
Pipeline #69122 failed
...@@ -23,7 +23,7 @@ RUN echo "Adding system components" && \ ...@@ -23,7 +23,7 @@ RUN echo "Adding system components" && \
ADD bin/* /usr/local/bin/ ADD bin/* /usr/local/bin/
RUN echo "Setup MdShow" && \ RUN echo "Setup mdshow" && \
mdshow setup && \ mdshow setup && \
ln -s /opt/mdshow/reveal.js/node_modules/gulp/bin/gulp.js /usr/bin/gulp && \ ln -s /opt/mdshow/reveal.js/node_modules/gulp/bin/gulp.js /usr/bin/gulp && \
mkdir -p /opt/mdshow/theme && \ mkdir -p /opt/mdshow/theme && \
...@@ -40,5 +40,6 @@ RUN echo "Setup MdShow" && \ ...@@ -40,5 +40,6 @@ RUN echo "Setup MdShow" && \
rm -rf /root/.npm && \ rm -rf /root/.npm && \
echo "Completed" echo "Completed"
WORKDIR /mdshow
ENTRYPOINT ["docker-entrypoint.sh"] ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["/bin/bash"] CMD ["/bin/bash"]
#!/bin/sh #!/bin/bash
set -e set -e
set -u
# first arg is `-f` or `--some-option` # first arg is `-f` or `--some-option`
if [ "${1#-}" != "$1" ]; then if [ "${1#-}" != "$1" ]; then
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
SHELL := /bin/bash SHELL := /bin/bash
MDSHOW_CONFIG = /opt/mdshow CONFIG_PATH = ${HOME}/.config
MDSHOW_CONFIG = $(CONFIG_PATH)/mdshow
SLIDES = slides.md SLIDES = slides.md
BUILD_DIR = .build_$(basename $(SLIDES)) BUILD_DIR = .build_$(basename $(SLIDES))
PORT = 3000 PORT = 3000
......
...@@ -4,4 +4,4 @@ if [[ -n $MDSHOW_THEME_PATH ]]; then ...@@ -4,4 +4,4 @@ if [[ -n $MDSHOW_THEME_PATH ]]; then
THEME=--volume=${MDSHOW_THEME_PATH}:/opt/mdshow/theme/$(basename ${MDSHOW_THEME_PATH}) THEME=--volume=${MDSHOW_THEME_PATH}:/opt/mdshow/theme/$(basename ${MDSHOW_THEME_PATH})
fi 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.
Please register or to comment