Skip to content

Commit f356b0c

Browse files
mblaschkemblaschke
committed
Removed Dockerfiles to specific version Dockerfiles
1 parent ac43d66 commit f356b0c

File tree

6 files changed

+182
-9
lines changed

6 files changed

+182
-9
lines changed

‎docker-compose.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@
22
# Main php container
33
#######################################
44
main:
5-
build: docker/main/ubuntu # dynamic ubuntu version (ansible provisioning)
6-
#build: docker/main/centos # dynamic centos version (ansible provisioning)
7-
#build: docker/main/ubuntu-hhvm # ubuntu lts with HHVM (ansible provisioning)
5+
## Ubuntu
6+
build: docker/main/ubuntu
7+
#dockerfile: Ubuntu-12.04 # Ubuntu 12.04 - PHP 5.3, LTS (precise)
8+
dockerfile: Ubuntu-14.04 # Ubuntu 14.04 - PHP 5.5, LTS (trusty)
9+
#dockerfile: Ubuntu-15.04 # Ubuntu 15.04 - PHP 5.6 (vivid)
10+
#dockerfile: Ubuntu-15.10 # Ubuntu 15.10 - PHP 5.6 (wily)
11+
12+
## CentOS
13+
#build: docker/main/centos
14+
#dockerfile: docker/main/centos/Centos-7 # CentOS 7 - PHP 5.4
15+
#dockerfile: docker/main/ubuntu-hhvm # ubuntu lts with HHVM (ansible provisioning)
816
links:
917
- mysql
1018
#- postgres

‎docker/main/centos/Dockerfile‎ renamed to ‎docker/main/centos/Centos-7‎

File renamed without changes.

‎docker/main/ubuntu/Ubuntu-12.04‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Ubuntu PHP Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# Prebuild images:
6+
#
7+
# webdevops/php-boilerplate:ubuntu-12.04
8+
#
9+
# Official images:
10+
#
11+
# ubuntu:12.04 - PHP 5.3, LTS (precise)
12+
# https://registry.hub.docker.com/u/library/ubuntu/
13+
#
14+
#++++++++++++++++++++++++++++++++++++++
15+
16+
FROM webdevops/php-boilerplate:ubuntu-12.04
17+
18+
# Ensure UTF-8
19+
RUN locale-gen en_US.UTF-8
20+
ENV LANG en_US.UTF-8
21+
ENV LC_ALL en_US.UTF-8
22+
23+
##
24+
# Bootstrap
25+
##
26+
27+
COPY conf/locale.conf /opt/docker/locale.conf
28+
COPY bin/bootstrap.sh /opt/docker/bin/bootstrap.sh
29+
COPY bin/provision.sh /opt/docker/bin/provision.sh
30+
COPY bin/logwatch.sh /opt/docker/bin/logwatch.sh
31+
COPY bin/dnsmasq.sh /opt/docker/bin/dnsmasq.sh
32+
COPY provision /opt/docker/provision/
33+
34+
RUN bash /opt/docker/bin/bootstrap.sh
35+
RUN bash /opt/docker/bin/provision.sh bootstrap
36+
37+
##
38+
# Customization
39+
##
40+
41+
COPY bin/customization.sh /opt/docker/bin/customization.sh
42+
RUN bash /opt/docker/bin/customization.sh
43+
44+
##
45+
# Config
46+
##
47+
48+
COPY entrypoint.sh /entrypoint.sh
49+
COPY conf /opt/docker/conf/
50+
51+
EXPOSE 9000
52+
53+
VOLUME /docker/
54+
WORKDIR /docker/code/
55+
56+
ENTRYPOINT ["/entrypoint.sh"]
57+
CMD ["supervisord"]

‎docker/main/ubuntu/Dockerfile‎ renamed to ‎docker/main/ubuntu/Ubuntu-14.04‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,11 @@
44
#
55
# Prebuild images:
66
#
7-
# webdevops/php-boilerplate:ubuntu-12.04
87
# webdevops/php-boilerplate:ubuntu-14.04
9-
# webdevops/php-boilerplate:ubuntu-15.04
10-
# webdevops/php-boilerplate:ubuntu-15.10
118
#
129
# Official images:
1310
#
14-
# ubuntu:12.04 - PHP 5.3, LTS (precise)
1511
# ubuntu:14.04 - PHP 5.5, LTS (trusty)
16-
# ubuntu:15.04 - PHP 5.6 (vivid)
17-
# ubuntu:15.10 - PHP 5.6 (wily)
1812
# https://registry.hub.docker.com/u/library/ubuntu/
1913
#
2014
#++++++++++++++++++++++++++++++++++++++

‎docker/main/ubuntu/Ubuntu-15.04‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Ubuntu PHP Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# Prebuild images:
6+
#
7+
# webdevops/php-boilerplate:ubuntu-15.04
8+
#
9+
# Official images:
10+
#
11+
# ubuntu:15.04 - PHP 5.6 (vivid)
12+
# https://registry.hub.docker.com/u/library/ubuntu/
13+
#
14+
#++++++++++++++++++++++++++++++++++++++
15+
16+
FROM webdevops/php-boilerplate:ubuntu-15.04
17+
18+
# Ensure UTF-8
19+
RUN locale-gen en_US.UTF-8
20+
ENV LANG en_US.UTF-8
21+
ENV LC_ALL en_US.UTF-8
22+
23+
##
24+
# Bootstrap
25+
##
26+
27+
COPY conf/locale.conf /opt/docker/locale.conf
28+
COPY bin/bootstrap.sh /opt/docker/bin/bootstrap.sh
29+
COPY bin/provision.sh /opt/docker/bin/provision.sh
30+
COPY bin/logwatch.sh /opt/docker/bin/logwatch.sh
31+
COPY bin/dnsmasq.sh /opt/docker/bin/dnsmasq.sh
32+
COPY provision /opt/docker/provision/
33+
34+
RUN bash /opt/docker/bin/bootstrap.sh
35+
RUN bash /opt/docker/bin/provision.sh bootstrap
36+
37+
##
38+
# Customization
39+
##
40+
41+
COPY bin/customization.sh /opt/docker/bin/customization.sh
42+
RUN bash /opt/docker/bin/customization.sh
43+
44+
##
45+
# Config
46+
##
47+
48+
COPY entrypoint.sh /entrypoint.sh
49+
COPY conf /opt/docker/conf/
50+
51+
EXPOSE 9000
52+
53+
VOLUME /docker/
54+
WORKDIR /docker/code/
55+
56+
ENTRYPOINT ["/entrypoint.sh"]
57+
CMD ["supervisord"]

‎docker/main/ubuntu/Ubuntu-15.10‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Ubuntu PHP Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# Prebuild images:
6+
#
7+
# webdevops/php-boilerplate:ubuntu-15.10
8+
#
9+
# Official images:
10+
#
11+
# ubuntu:15.10 - PHP 5.6 (wily)
12+
# https://registry.hub.docker.com/u/library/ubuntu/
13+
#
14+
#++++++++++++++++++++++++++++++++++++++
15+
16+
FROM webdevops/php-boilerplate:ubuntu-15.10
17+
18+
# Ensure UTF-8
19+
RUN locale-gen en_US.UTF-8
20+
ENV LANG en_US.UTF-8
21+
ENV LC_ALL en_US.UTF-8
22+
23+
##
24+
# Bootstrap
25+
##
26+
27+
COPY conf/locale.conf /opt/docker/locale.conf
28+
COPY bin/bootstrap.sh /opt/docker/bin/bootstrap.sh
29+
COPY bin/provision.sh /opt/docker/bin/provision.sh
30+
COPY bin/logwatch.sh /opt/docker/bin/logwatch.sh
31+
COPY bin/dnsmasq.sh /opt/docker/bin/dnsmasq.sh
32+
COPY provision /opt/docker/provision/
33+
34+
RUN bash /opt/docker/bin/bootstrap.sh
35+
RUN bash /opt/docker/bin/provision.sh bootstrap
36+
37+
##
38+
# Customization
39+
##
40+
41+
COPY bin/customization.sh /opt/docker/bin/customization.sh
42+
RUN bash /opt/docker/bin/customization.sh
43+
44+
##
45+
# Config
46+
##
47+
48+
COPY entrypoint.sh /entrypoint.sh
49+
COPY conf /opt/docker/conf/
50+
51+
EXPOSE 9000
52+
53+
VOLUME /docker/
54+
WORKDIR /docker/code/
55+
56+
ENTRYPOINT ["/entrypoint.sh"]
57+
CMD ["supervisord"]

0 commit comments

Comments
 (0)