...
 
Commits (4)
docker-compose.yml docker-compose.yml
nginx/cache
...@@ -8,19 +8,19 @@ services: ...@@ -8,19 +8,19 @@ services:
networks: networks:
default: default:
aliases: aliases:
- redis.grav.troy - redis.[grav.local]
app: app:
image: kiwilightweight/grav image: kiwilightweight/grav
links: links:
- redis - redis
volumes: volumes:
- /home/dave/Projects/grav/new:/var/www/html - [path-to-my-grav-data]:/var/www/html
restart: restart:
unless-stopped unless-stopped
networks: networks:
default: default:
aliases: aliases:
- grav.troy - [grav.local]
nginx: nginx:
image: oeru/nginx-jessie image: oeru/nginx-jessie
links: links:
...@@ -31,9 +31,9 @@ services: ...@@ -31,9 +31,9 @@ services:
volumes: volumes:
- ./nginx:/etc/nginx/conf.d - ./nginx:/etc/nginx/conf.d
- ./nginx/cache:/var/cache/nginx - ./nginx/cache:/var/cache/nginx
- /home/dave/Projects/grav/new:/var/www/html - [path-to-my-grav-data]:/var/www/html
restart: unless-stopped restart: unless-stopped
networks: networks:
default: default:
aliases: aliases:
- nginx.grav.troy - nginx.[grav.local]
version: "3"
services:
redis:
image: redis:4-alpine
restart:
unless-stopped
networks:
default:
aliases:
<<<<<<< HEAD:docker-compose.yml
- redis.grav.troy
=======
- redis.grav.nzoss.nz
>>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535:docker-compose.yml.sample
app:
image: kiwilightweight/grav
links:
- redis
volumes:
- /home/data/nzoss/grav:/var/www/html
restart:
unless-stopped
networks:
default:
aliases:
<<<<<<< HEAD:docker-compose.yml
- grav.troy
=======
- grav.nzoss.nz
>>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535:docker-compose.yml.sample
nginx:
image: oeru/nginx-jessie
links:
- app
- redis
ports:
- "127.0.0.1:8081:80"
volumes:
- ./nginx:/etc/nginx/conf.d
- ./nginx/cache:/var/cache/nginx
- /home/data/nzoss/grav:/var/www/html
restart: unless-stopped
networks:
default:
aliases:
<<<<<<< HEAD:docker-compose.yml
- nginx.grav.troy
=======
- nginx.grav.nzoss.nz
>>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535:docker-compose.yml.sample
...@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y apt-utils git less libbz2-dev libc-clie ...@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y apt-utils git less libbz2-dev libc-clie
libpspell-dev libssl-dev libxml2-dev telnet unzip zip libpspell-dev libssl-dev libxml2-dev telnet unzip zip
RUN apt-get install -y net-tools vim dnsutils RUN apt-get install -y net-tools vim dnsutils
# install cron and msmtp for outgoing email # install cron and msmtp for outgoing email
RUN apt-get install -y cron msmtp RUN apt-get install -y cron msmtp sudo
RUN docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos RUN docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos
# RUN docker-php-ext-install bz2 curl imap intl mbstring mcrypt \ # RUN docker-php-ext-install bz2 curl imap intl mbstring mcrypt \
RUN docker-php-ext-install bz2 curl imap intl mbstring \ RUN docker-php-ext-install bz2 curl imap intl mbstring \
...@@ -33,6 +33,8 @@ RUN apt-get update && apt-get install -y \ ...@@ -33,6 +33,8 @@ RUN apt-get update && apt-get install -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng-dev \ libpng-dev \
<<<<<<< HEAD
=======
# && docker-php-ext-install -j$(nproc) iconv mcrypt \ # && docker-php-ext-install -j$(nproc) iconv mcrypt \
&& docker-php-ext-install -j$(nproc) iconv \ && docker-php-ext-install -j$(nproc) iconv \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
......
...@@ -4,33 +4,37 @@ set -e ...@@ -4,33 +4,37 @@ set -e
SEMAPH=composer-running SEMAPH=composer-running
if ! [ -f $SEMAPH ] ; then # if it's not already there, install composer.
# create the semaphore file with the date in it... if ! [ -e /usr/local/bin/composer ]; then
echo >&2 "first getting Composer"
# Get Composer
curl -S https://getcomposer.org/installer | php
chmod a+x composer.phar
mv composer.phar /usr/local/bin/composer
fi
if ! [ -e .git/hooks ]; then
echo >&2 "creating a .git/hooks dir to avoid errors"
mkdir -p .git/hooks
fi
if ! [ -f $SEMAPH ] ; then
# create the semaphore file with the date in it...
date > $SEMAPH date > $SEMAPH
# run composer to set up dependencies if not already there... # run composer to set up dependencies if not already there...
if ! [ -e vendor/autoload.php ]; then if ! [ -e vendor/autoload.php ]; then
echo >&2 "installing dependencies with Composer" echo >&2 "installing dependencies with Composer"
if ! [ -e /usr/local/bin/composer ]; then
echo >&2 "first getting Composer"
# Get Composer
curl -S https://getcomposer.org/installer | php
chmod a+x composer.phar
mv composer.phar /usr/local/bin/composer
fi
if ! [ -e .git/hooks ]; then
echo >&2 "creating a .git/hooks dir to avoid errors"
mkdir -p .git/hooks
fi
composer install composer install
else else
echo >&2 "vendor dependencies already in place." echo >&2 "vendor dependencies already in place, updating."
composer update
fi fi
#remove semaphore #remove semaphore
rm $SEMAPH rm $SEMAPH
else else
echo >&2 "Looks like another composer is already running. If not, please remove $SEMAPH" echo >&2 "Looks like another composer is already running. If not, please remove $SEMAPH"
fi fi
exec "$@" exec "$@"