diff --git a/Dockerfile b/Dockerfile index d2bcb1e..441f5d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,10 @@ FROM node:10.15.0 as app +RUN \ + apt -y update && \ + apt -y install moreutils + + WORKDIR /app #wildcard as some files may not be in all repos diff --git a/entrypoint.sh b/entrypoint.sh old mode 100755 new mode 100644 index f1f1dab..14773c0 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,25 +1,6 @@ -#!/bin/sh +#!/bin/bash -date -echo "Changing permissions of /var/run/docker.sock for sibling containers" -ls -al /var/run/docker.sock -docker --version -cat /etc/passwd +set -o pipefail -DOCKER_GROUP=$(stat -c '%g' /var/run/docker.sock) -groupadd --non-unique --gid ${DOCKER_GROUP} dockeronhost -usermod -aG dockeronhost node +inner-entrypoint.sh "$@" | ts -mkdir -p /app/cache -chown -R node:node /app/cache - -mkdir -p /app/compiles -chown -R node:node /app/compiles - -chown -R node:node /app/bin/synctex -mkdir -p /app/test/acceptance/fixtures/tmp/ -chown -R node:node /app - -chown -R node:node /app/bin - -exec runuser -u node -- "$@" diff --git a/inner-entrypoint.sh b/inner-entrypoint.sh new file mode 100755 index 0000000..f1f1dab --- /dev/null +++ b/inner-entrypoint.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +date +echo "Changing permissions of /var/run/docker.sock for sibling containers" +ls -al /var/run/docker.sock +docker --version +cat /etc/passwd + +DOCKER_GROUP=$(stat -c '%g' /var/run/docker.sock) +groupadd --non-unique --gid ${DOCKER_GROUP} dockeronhost +usermod -aG dockeronhost node + +mkdir -p /app/cache +chown -R node:node /app/cache + +mkdir -p /app/compiles +chown -R node:node /app/compiles + +chown -R node:node /app/bin/synctex +mkdir -p /app/test/acceptance/fixtures/tmp/ +chown -R node:node /app + +chown -R node:node /app/bin + +exec runuser -u node -- "$@"