Skip to content

Commit dab6033

Browse files
committed
Dockerfiles: reformat
1 parent f8554fe commit dab6033

6 files changed

Lines changed: 19 additions & 12 deletions

File tree

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Great LAMP devstack for you home programming.
99

1010
- Apache >= 2.4.10
1111
- PHP
12-
- >= 7.0.6
13-
- >= 5.6.20
12+
- >= 7.0.x
13+
- >= 5.6.x
1414
- NodeJS 5.x + NPM (Gulp, Grunt)
1515
- Composer
16-
- MariaDB >= 10.1.0
16+
- MariaDB >= 10.1.x
1717

1818
## Bin
1919

@@ -22,12 +22,16 @@ Usage: devstack [-h]
2222

2323
Control your devstack.
2424

25+
Version: 1.0
26+
2527
Options:
2628

2729
-h Display this help and exit.
2830

2931
Commands:
3032
up Start the devstack.
33+
build Build the devstack.
34+
reup Build & Start the devstack.
3135
stop Stop the devstack.
3236
die Destroy the devstack.
3337
logs Follow the devstack logs.

‎apache/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ ENV APACHE_PID_FILE /var/run/apache2.pid
1111
RUN apt-get update && apt-get update -y && \
1212
apt-get install -y apache2 && \
1313
a2enmod include && \
14-
a2enmod rewrite && \
15-
a2enmod proxy_fcgi && \
14+
a2enmod rewrite && \
15+
a2enmod proxy_fcgi && \
1616
rm /etc/apache2/sites-enabled/000-default.conf && \
1717
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
1818
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*

‎devstack‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
# Configuration
44
PREFIX=devstack
5-
COMPOSE=PATH/TO/docker-compose.yml
5+
COMPOSE=./docker-compose.yml
66
USER=dfx
7+
VERSION=1.0
78

89
# Functions
910
usage() {
@@ -12,6 +13,8 @@ Usage: ${0##*/} [-h]
1213
1314
Control your devstack.
1415
16+
Version: $VERSION
17+
1518
Options:
1619
1720
-h Display this help and exit.

‎php/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ MAINTAINER Milan Sulc <sulcmil@gmail.com>
55
RUN apt-get update && apt-get update -y && \
66
apt-get install -y wget curl git && \
77
echo " IdentityFile ~/.ssh/id_rsa" >> /etc/ssh/ssh_config && \
8-
curl -sL https://deb.nodesource.com/setup_5.x | bash - \
8+
curl -sL https://deb.nodesource.com/setup_5.x | bash - \
99
&& apt-get install -y nodejs \
1010
&& npm install -g gulp bower grunt && \
11-
curl -o /usr/local/bin/phpmailer https://gist.githubusercontent.com/f3l1x/d6f02fc3b498e33059e8876a73e9ae13/raw/e3011357d082f3810c3d8d1f57427e36525dc30f/phpmailer && \
11+
curl -o /usr/local/bin/phpmailer https://gist.githubusercontent.com/f3l1x/d6f02fc3b498e33059e8876a73e9ae13/raw/e3011357d082f3810c3d8d1f57427e36525dc30f/phpmailer && \
1212
mkdir -p /var/log/mail && \
1313
chmod 755 /usr/local/bin/phpmailer && \
1414
chmod 777 /var/log/mail && \

‎php5.6-fpm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM dockette/devstack:php56
33
MAINTAINER Milan Sulc <sulcmil@gmail.com>
44

55
RUN apt-get update && apt-get install -y php5-fpm && \
6-
ln -s /etc/php/mods-available/devstack.ini /etc/php5/fpm/conf.d/999-devstack.ini && \
7-
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
6+
ln -s /etc/php/mods-available/devstack.ini /etc/php5/fpm/conf.d/999-devstack.ini && \
7+
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
88
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
99

1010
ADD fpm/php-fpm.conf /etc/php5/fpm/php-fpm.conf

‎php7.0-fpm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM dockette/devstack:php7
33
MAINTAINER Milan Sulc <sulcmil@gmail.com>
44

55
RUN apt-get update && apt-get install -y php7.0-fpm && \
6-
ln -s /etc/php/mods-available/devstack.ini /etc/php/7.0/fpm/conf.d/999-devstack.ini && \
7-
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
6+
ln -s /etc/php/mods-available/devstack.ini /etc/php/7.0/fpm/conf.d/999-devstack.ini && \
7+
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
88
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
99

1010
ADD fpm/php-fpm.conf /etc/php/7.0/fpm/php-fpm.conf

0 commit comments

Comments
 (0)