Update docker build script and tools

This commit is contained in:
2018-04-12 07:32:44 +03:00
parent c4f11d1e69
commit a239631e9b
8 changed files with 40 additions and 34 deletions

8
tools/build Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
source .env
docker build \
--file docker/Dockerfile \
--tag ${PHP_IMAGE} \
$PWD

View File

@ -2,16 +2,17 @@
source .env
mkdir -p ./.composer/cache
mkdir -p var/docker-cache/.composer
docker run \
--rm \
--interactive \
--tty \
--user $UID:$(id -g) \
--user "$UID:$(id -g)" \
--volume /etc/passwd:/etc/passwd:ro \
--volume /etc/group:/etc/group:ro \
--volume $PWD:/srv/homepage \
--volume $PWD/.composer:/tmp/.composer \
--volume $PWD:/srv/app \
--volume $HOME:$HOME \
--volume $PWD/var/docker-cache/.composer:/tmp/.composer \
--env COMPOSER_HOME=/tmp/.composer \
${HOMEPAGE_IMAGE} composer "$@"
${PHP_IMAGE} composer "$@"

View File

@ -2,14 +2,18 @@
source .env
mkdir -p ./.npm
mkdir -p var/docker-cache/.npm
docker run \
--rm \
--interactive \
--tty \
--user $UID:$(id -g) \
--volume $PWD:/srv/homepage \
--volume $PWD/.npm:/tpm/.npm \
--user "$UID:$(id -g)" \
--volume /etc/passwd:/etc/passwd:ro \
--volume /etc/group:/etc/group:ro \
--volume $PWD:/srv/app \
--volume $HOME:$HOME \
--volume $PWD/var/docker-cache/.npm:/tmp/.npm \
--env npm_config_cache=/tmp/.npm \
${HOMEPAGE_IMAGE} npm "$@"
--workdir /srv/app \
${NODE_IMAGE} npm "$@"

View File

@ -6,10 +6,9 @@ docker run \
--rm \
--interactive \
--tty \
--user "$UID" \
--init \
--volume="$PWD:/srv/homepage" \
--user "$UID:$(id -g)" \
--volume="$PWD:/srv/app" \
--expose=8000 \
--publish=8000:8000 \
${HOMEPAGE_IMAGE} \
./vendor/bin/sculpin "$@"
${PHP_IMAGE} ./vendor/bin/sculpin "$@"