Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
docker-grav
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dave Lane
docker-grav
Compare Revisions
b7bae90d0bbb2d611153026d143af1db74181aa5...3a8765792d81882bfbc55a04072f6f60bd1ce147
Source
3a8765792d81882bfbc55a04072f6f60bd1ce147
Select Git revision
...
Target
b7bae90d0bbb2d611153026d143af1db74181aa5
Select Git revision
Compare
Commits (4)
updating to php7.2-fpm-stretch
· c86b0b70
Dave Lane
authored
Sep 01, 2018
c86b0b70
working PHP 7.2 configuration
· f89405cb
Dave Lane
authored
Sep 02, 2018
f89405cb
tokenised sample yml file
· f23d4bf2
Dave Lane
authored
Nov 13, 2018
f23d4bf2
added cache dir to ignore
· 3a876579
Dave Lane
authored
Nov 13, 2018
3a876579
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
73 deletions
+29
-73
.gitignore
.gitignore
+1
-0
docker-compose.yml-sample
docker-compose.yml-sample
+5
-5
docker-compose.yml.sample
docker-compose.yml.sample
+0
-51
php/Dockerfile
php/Dockerfile
+3
-1
php/docker-entrypoint.sh
php/docker-entrypoint.sh
+20
-16
No files found.
.gitignore
View file @
3a876579
docker-compose.yml
nginx/cache
docker-compose.yml-sample
View file @
3a876579
...
...
@@ -8,19 +8,19 @@ services:
networks:
default:
aliases:
- redis.
grav.troy
- redis.
[grav.local]
app:
image: kiwilightweight/grav
links:
- redis
volumes:
-
/home/dave/Projects/grav/new
:/var/www/html
-
[path-to-my-grav-data]
:/var/www/html
restart:
unless-stopped
networks:
default:
aliases:
-
grav.troy
-
[grav.local]
nginx:
image: oeru/nginx-jessie
links:
...
...
@@ -31,9 +31,9 @@ services:
volumes:
- ./nginx:/etc/nginx/conf.d
- ./nginx/cache:/var/cache/nginx
-
/home/dave/Projects/grav/new
:/var/www/html
-
[path-to-my-grav-data]
:/var/www/html
restart: unless-stopped
networks:
default:
aliases:
- nginx.
grav.troy
- nginx.
[grav.local]
docker-compose.yml.sample
deleted
100644 → 0
View file @
b7bae90d
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
php/Dockerfile
View file @
3a876579
...
...
@@ -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
RUN
apt-get
install
-y
net-tools vim dnsutils
# 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-install bz2 curl imap intl mbstring mcrypt \
RUN
docker-php-ext-install bz2 curl imap intl mbstring
\
...
...
@@ -33,6 +33,8 @@ RUN apt-get update && apt-get install -y \
libjpeg62-turbo-dev
\
libmcrypt-dev
\
libpng-dev
\
<<<<<<
< HEAD
=======
# && docker-php-ext-install -j$(nproc) iconv mcrypt \
&& docker-php-ext-install -j$(nproc) iconv \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
...
...
php/docker-entrypoint.sh
View file @
3a876579
...
...
@@ -4,27 +4,31 @@ set -e
SEMAPH
=
composer-running
if
!
[
-f
$SEMAPH
]
;
then
# create the semaphore file with the date in it...
date
>
$SEMAPH
# run composer to set up dependencies if not already there...
if
!
[
-e
vendor/autoload.php
]
;
then
echo
>
&2
"installing dependencies with Composer"
if
!
[
-e
/usr/local/bin/composer
]
;
then
# if it's not already there, install 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
fi
if
!
[
-e
.git/hooks
]
;
then
echo
>
&2
"creating a .git/hooks dir to avoid errors"
mkdir
-p
.git/hooks
fi
fi
if
!
[
-f
$SEMAPH
]
;
then
# create the semaphore file with the date in it...
date
>
$SEMAPH
# run composer to set up dependencies if not already there...
if
!
[
-e
vendor/autoload.php
]
;
then
echo
>
&2
"installing dependencies with Composer"
composer
install
else
echo
>
&2
"vendor dependencies already in place."
echo
>
&2
"vendor dependencies already in place, updating."
composer update
fi
#remove semaphore
...
...