Skip to content

Commit b4ff98f

Browse files
authored
Merge pull request #29 from patricklee2/modules
Modules
2 parents 44bb079 + 02dfc33 commit b4ff98f

File tree

5 files changed

+199
-79
lines changed

5 files changed

+199
-79
lines changed

5.6.36-apache/Dockerfile

Lines changed: 64 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,27 @@ COPY hostingstart.html /home/site/wwwroot/hostingstart.html
88
RUN a2enmod rewrite expires include deflate
99

1010
# install the PHP extensions we need
11-
RUN apt update \
12-
&& apt install -y --no-install-recommends \
13-
libpng12-dev \
14-
libjpeg-dev \
15-
libpq-dev \
16-
libmcrypt-dev \
17-
libldap2-dev \
18-
libldb-dev \
19-
libicu-dev \
20-
libgmp-dev \
21-
libmagickwand-dev \
22-
openssh-server vim curl wget tcptraceroute \
11+
RUN apt-get update \
12+
&& apt-get install -y --no-install-recommends \
13+
libpng-dev \
14+
libjpeg-dev \
15+
libpq-dev \
16+
libmcrypt-dev \
17+
libldap2-dev \
18+
libldb-dev \
19+
libicu-dev \
20+
libgmp-dev \
21+
libmagickwand-dev \
22+
libc-client-dev \
23+
libtidy-dev \
24+
libkrb5-dev \
25+
libxslt-dev \
26+
unixodbc-dev \
27+
openssh-server \
28+
vim \
29+
curl \
30+
wget \
31+
tcptraceroute \
2332
&& chmod 755 /bin/init_container.sh \
2433
&& echo "root:Docker!" | chpasswd \
2534
&& echo "cd /home" >> /etc/bash.bashrc \
@@ -29,23 +38,52 @@ RUN apt update \
2938
&& rm -rf /var/lib/apt/lists/* \
3039
&& pecl install imagick-beta \
3140
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
41+
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
42+
&& docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \
3243
&& docker-php-ext-install gd \
33-
mysqli \
34-
opcache \
35-
pdo \
36-
pdo_mysql \
37-
pdo_pgsql \
38-
pgsql \
39-
ldap \
40-
intl \
41-
mcrypt \
42-
gmp \
43-
zip \
44-
bcmath \
45-
mbstring \
46-
pcntl \
44+
mysqli \
45+
opcache \
46+
pdo \
47+
pdo_mysql \
48+
pdo_pgsql \
49+
pgsql \
50+
ldap \
51+
intl \
52+
mcrypt \
53+
gmp \
54+
zip \
55+
bcmath \
56+
mbstring \
57+
pcntl \
58+
calendar \
59+
exif \
60+
gettext \
61+
imap \
62+
tidy \
63+
shmop \
64+
soap \
65+
sockets \
66+
sysvmsg \
67+
sysvsem \
68+
sysvshm \
69+
pdo_odbc \
70+
wddx \
71+
xmlrpc \
72+
xsl \
4773
&& docker-php-ext-enable imagick
4874

75+
# install odbc php ext
76+
RUN apt-get update \
77+
&& apt-get install unixodbc-dev
78+
79+
RUN set -x \
80+
&& docker-php-source extract \
81+
&& cd /usr/src/php/ext/odbc \
82+
&& phpize \
83+
&& sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure \
84+
&& ./configure --with-unixODBC=shared,/usr \
85+
&& docker-php-ext-install odbc
86+
4987
RUN \
5088
rm -f /var/log/apache2/* \
5189
&& rmdir /var/lock/apache2 \

5.6.36-apache/apache2.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ LogLevel warn
1515
IncludeOptional mods-enabled/*.load
1616
IncludeOptional mods-enabled/*.conf
1717

18+
IncludeOptional conf-enabled/*.conf
19+
IncludeOptional sites-enabled/*.conf
20+
1821
# ports.conf
1922
Listen {PORT}
2023

@@ -54,8 +57,5 @@ CustomLog /dev/stdout combined
5457
DirectoryIndex disabled
5558
DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html
5659

57-
IncludeOptional conf-enabled/*.conf
58-
IncludeOptional sites-enabled/*.conf
59-
6060
ServerTokens Prod
6161
ServerSignature Off

7.0.30-apache/Dockerfile

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,25 @@ RUN a2enmod rewrite expires include deflate
1010
# install the PHP extensions we need
1111
RUN apt-get update \
1212
&& apt-get install -y --no-install-recommends \
13-
libpng12-dev \
14-
libjpeg-dev \
15-
libpq-dev \
16-
libmcrypt-dev \
17-
libldap2-dev \
18-
libldb-dev \
19-
libicu-dev \
20-
libgmp-dev \
21-
libmagickwand-dev \
22-
openssh-server vim curl wget tcptraceroute \
13+
libpng-dev \
14+
libjpeg-dev \
15+
libpq-dev \
16+
libmcrypt-dev \
17+
libldap2-dev \
18+
libldb-dev \
19+
libicu-dev \
20+
libgmp-dev \
21+
libmagickwand-dev \
22+
libc-client-dev \
23+
libtidy-dev \
24+
libkrb5-dev \
25+
libxslt-dev \
26+
unixodbc-dev \
27+
openssh-server \
28+
vim \
29+
curl \
30+
wget \
31+
tcptraceroute \
2332
&& chmod 755 /bin/init_container.sh \
2433
&& echo "root:Docker!" | chpasswd \
2534
&& echo "cd /home" >> /etc/bash.bashrc \
@@ -28,24 +37,56 @@ RUN apt-get update \
2837
&& ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \
2938
&& rm -rf /var/lib/apt/lists/* \
3039
&& pecl install imagick-beta \
40+
&& pecl install sqlsrv pdo_sqlsrv \
41+
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
42+
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini \
3143
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
44+
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
45+
&& docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \
3246
&& docker-php-ext-install gd \
33-
mysqli \
34-
opcache \
35-
pdo \
36-
pdo_mysql \
37-
pdo_pgsql \
38-
pgsql \
39-
ldap \
40-
intl \
41-
mcrypt \
42-
gmp \
43-
zip \
44-
bcmath \
45-
mbstring \
46-
pcntl \
47+
mysqli \
48+
opcache \
49+
pdo \
50+
pdo_mysql \
51+
pdo_pgsql \
52+
pgsql \
53+
ldap \
54+
intl \
55+
mcrypt \
56+
gmp \
57+
zip \
58+
bcmath \
59+
mbstring \
60+
pcntl \
61+
calendar \
62+
exif \
63+
gettext \
64+
imap \
65+
tidy \
66+
shmop \
67+
soap \
68+
sockets \
69+
sysvmsg \
70+
sysvsem \
71+
sysvshm \
72+
pdo_odbc \
73+
wddx \
74+
xmlrpc \
75+
xsl \
4776
&& docker-php-ext-enable imagick
4877

78+
# install odbc php ext
79+
RUN apt-get update \
80+
&& apt-get install unixodbc-dev
81+
82+
RUN set -x \
83+
&& docker-php-source extract \
84+
&& cd /usr/src/php/ext/odbc \
85+
&& phpize \
86+
&& sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure \
87+
&& ./configure --with-unixODBC=shared,/usr \
88+
&& docker-php-ext-install odbc
89+
4990
RUN \
5091
rm -f /var/log/apache2/* \
5192
&& rmdir /var/lock/apache2 \

7.0.30-apache/apache2.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ LogLevel warn
1515
IncludeOptional mods-enabled/*.load
1616
IncludeOptional mods-enabled/*.conf
1717

18+
IncludeOptional conf-enabled/*.conf
19+
IncludeOptional sites-enabled/*.conf
20+
1821
# ports.conf
1922
Listen {PORT}
2023

@@ -54,9 +57,6 @@ CustomLog /dev/stdout combined
5457
DirectoryIndex disabled
5558
DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html
5659

57-
IncludeOptional conf-enabled/*.conf
58-
IncludeOptional sites-enabled/*.conf
59-
6060
ServerTokens Prod
6161
ServerSignature Off
6262

7.2.5-apache/Dockerfile

Lines changed: 64 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,25 @@ RUN a2enmod rewrite expires include deflate
1010
# install the PHP extensions we need
1111
RUN apt-get update \
1212
&& apt-get install -y --no-install-recommends \
13-
libpng-dev \
14-
libjpeg-dev \
15-
libpq-dev \
16-
libmcrypt-dev \
17-
libldap2-dev \
18-
libldb-dev \
19-
libicu-dev \
20-
libgmp-dev \
21-
libmagickwand-dev \
22-
openssh-server vim curl wget tcptraceroute \
13+
libpng-dev \
14+
libjpeg-dev \
15+
libpq-dev \
16+
libmcrypt-dev \
17+
libldap2-dev \
18+
libldb-dev \
19+
libicu-dev \
20+
libgmp-dev \
21+
libmagickwand-dev \
22+
libc-client-dev \
23+
libtidy-dev \
24+
libkrb5-dev \
25+
libxslt-dev \
26+
unixodbc-dev \
27+
openssh-server \
28+
vim \
29+
curl \
30+
wget \
31+
tcptraceroute \
2332
&& chmod 755 /bin/init_container.sh \
2433
&& echo "root:Docker!" | chpasswd \
2534
&& echo "cd /home" >> /etc/bash.bashrc \
@@ -29,24 +38,56 @@ RUN apt-get update \
2938
&& rm -rf /var/lib/apt/lists/* \
3039
&& pecl install imagick-beta \
3140
&& pecl install mcrypt-1.0.1 \
41+
&& pecl install sqlsrv pdo_sqlsrv \
42+
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
43+
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini \
3244
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
45+
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
46+
&& docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \
3347
&& docker-php-ext-install gd \
34-
mysqli \
35-
opcache \
36-
pdo \
37-
pdo_mysql \
38-
pdo_pgsql \
39-
pgsql \
40-
ldap \
41-
intl \
42-
gmp \
43-
zip \
44-
bcmath \
45-
mbstring \
46-
pcntl \
48+
mysqli \
49+
opcache \
50+
pdo \
51+
pdo_mysql \
52+
pdo_pgsql \
53+
pgsql \
54+
ldap \
55+
intl \
56+
gmp \
57+
zip \
58+
bcmath \
59+
mbstring \
60+
pcntl \
61+
calendar \
62+
exif \
63+
gettext \
64+
imap \
65+
tidy \
66+
shmop \
67+
soap \
68+
sockets \
69+
sysvmsg \
70+
sysvsem \
71+
sysvshm \
72+
pdo_odbc \
73+
wddx \
74+
xmlrpc \
75+
xsl \
4776
&& docker-php-ext-enable imagick \
4877
&& docker-php-ext-enable mcrypt
4978

79+
# install odbc php ext
80+
RUN apt-get update \
81+
&& apt-get install unixodbc-dev
82+
83+
RUN set -x \
84+
&& docker-php-source extract \
85+
&& cd /usr/src/php/ext/odbc \
86+
&& phpize \
87+
&& sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure \
88+
&& ./configure --with-unixODBC=shared,/usr \
89+
&& docker-php-ext-install odbc
90+
5091
RUN \
5192
rm -f /var/log/apache2/* \
5293
&& rmdir /var/lock/apache2 \

0 commit comments

Comments
 (0)