diff --git a/Dockerfile b/Dockerfile index a361625..4daab1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,13 @@ -FROM node:11 +FROM node:11.2 RUN apt update && apt install -y -qq wget curl libfontconfig libgl1-mesa-dev libxrender-dev libxcomposite-dev python sudo RUN wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin -ENV VAGRANT_PASSWORD='$6$rounds=656000$OY1EmeRe9//dqf8D$KRUcAe5ezDDL4hDe7nCGdURxev0jnIpOAAtfFzhPdd9wmNouedwX7EMxUaF16yrxxOUgpQlrpHVsZkIokXDKv0' -ENV VAGRANT_USER='vagrant' -RUN useradd --create-home --user-group --password "${VAGRANT_PASSWORD}" "${VAGRANT_USER}" +ENV USER_NAME='gitbook' +RUN useradd --create-home --user-group --password "" "${USER_NAME}" -RUN mkdir -p /etc/sudoers.d/ && echo "${VAGRANT_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -RUN su vagrant -c ' \ +RUN mkdir -p /etc/sudoers.d/ && echo "${USER_NAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/$USER_NAME +RUN su $USER_NAME -c ' \ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash \ && export NVM_DIR="$HOME/.nvm" \ && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \ @@ -19,4 +18,4 @@ RUN su vagrant -c ' \ WORKDIR /docs # run GitBook when the container starts -ENTRYPOINT ["gitbook"] +ENTRYPOINT ["/home/gitbook/.nvm/versions/node/v11.2.0/bin/gitbook"] diff --git a/docker-provision.sh b/docker-provision.sh deleted file mode 100755 index 6633e73..0000000 --- a/docker-provision.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -eux -# docker-provision.sh --- Provisioning script for a Docker container w/GitBook. -GITBOOK_CLI_VERSION="2.3.0" - -# update Apt repositories -apt-get update - -# install dependencies -apt-get install -y --no-install-recommends git calibre - -# install GitBook CLI -npm install -g gitbook-cli@$GITBOOK_CLI_VERSION - -# install the latest version...gets installed in $HOME (i.e. /root) -gitbook fetch latest - -# add gitbook wrapper script -cat < /usr/local/bin/gitbookw -#!/bin/sh -eu -# gitbookw --- Wrapper for gitbook that autoinstalls plugins. - -gitbook install -gitbook \$@ -EOF -chmod +x /usr/local/bin/gitbookw - -# clean up (apt) -apt-get clean # remove packages that have been downloaded, installed, and no longer needed -apt-get autoclean # remove archived packages that can no longer be downloaded -apt-get autoremove - -# clean up (misc.) -rm -rf /var/lib/apt/lists/* /var/cache/apt/* /root/.npm /tmp/npm* - -# Add empty docs directory -mkdir -p /docs