Skip to content

Commit e12af70

Browse files
committed
Styleguide
1 parent 771ef3a commit e12af70

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

docker/main/centos/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414

1515
FROM mblaschke/php-boilerplate:centos-7
1616

17-
ENV PATH /opt/ansible/bin:/bin:/usr/bin:/sbin:/usr/sbin
18-
ENV PYTHONPATH /opt/ansible/lib
19-
ENV ANSIBLE_LIBRARY /opt/ansible/library
17+
ENV PATH /opt/ansible/bin:/bin:/usr/bin:/sbin:/usr/sbin
18+
ENV PYTHONPATH /opt/ansible/lib
19+
ENV ANSIBLE_LIBRARY /opt/ansible/library
2020

2121
##
2222
# Bootstrap
2323
##
2424

25-
COPY conf/locale.conf /opt/docker/locale.conf
26-
COPY bin/bootstrap.sh /opt/docker/bin/bootstrap.sh
27-
COPY bin/provision.sh /opt/docker/bin/provision.sh
28-
COPY bin/logwatch.sh /opt/docker/bin/logwatch.sh
29-
COPY bin/dnsmasq.sh /opt/docker/bin/dnsmasq.sh
30-
COPY provision /opt/docker/provision/
25+
COPY conf/locale.conf /opt/docker/locale.conf
26+
COPY bin/bootstrap.sh /opt/docker/bin/bootstrap.sh
27+
COPY bin/provision.sh /opt/docker/bin/provision.sh
28+
COPY bin/logwatch.sh /opt/docker/bin/logwatch.sh
29+
COPY bin/dnsmasq.sh /opt/docker/bin/dnsmasq.sh
30+
COPY provision /opt/docker/provision/
3131

3232
RUN bash /opt/docker/bin/bootstrap.sh
3333
RUN bash /opt/docker/bin/provision.sh bootstrap
@@ -43,8 +43,8 @@ RUN bash /opt/docker/bin/customization.sh
4343
# Config
4444
##
4545

46-
COPY entrypoint.sh /entrypoint.sh
47-
COPY conf /opt/docker/conf/
46+
COPY entrypoint.sh /entrypoint.sh
47+
COPY conf /opt/docker/conf/
4848

4949
EXPOSE 9000
5050

docker/main/ubuntu/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121
FROM mblaschke/php-boilerplate:ubuntu-14.04
2222

2323
# Ensure UTF-8
24-
RUN locale-gen en_US.UTF-8
25-
ENV LANG en_US.UTF-8
26-
ENV LC_ALL en_US.UTF-8
24+
RUN locale-gen en_US.UTF-8
25+
ENV LANG en_US.UTF-8
26+
ENV LC_ALL en_US.UTF-8
2727

2828
##
2929
# Bootstrap
3030
##
3131

32-
COPY conf/locale.conf /opt/docker/locale.conf
33-
COPY bin/bootstrap.sh /opt/docker/bin/bootstrap.sh
34-
COPY bin/provision.sh /opt/docker/bin/provision.sh
35-
COPY bin/logwatch.sh /opt/docker/bin/logwatch.sh
36-
COPY bin/dnsmasq.sh /opt/docker/bin/dnsmasq.sh
37-
COPY provision /opt/docker/provision/
32+
COPY conf/locale.conf /opt/docker/locale.conf
33+
COPY bin/bootstrap.sh /opt/docker/bin/bootstrap.sh
34+
COPY bin/provision.sh /opt/docker/bin/provision.sh
35+
COPY bin/logwatch.sh /opt/docker/bin/logwatch.sh
36+
COPY bin/dnsmasq.sh /opt/docker/bin/dnsmasq.sh
37+
COPY provision /opt/docker/provision/
3838

3939
RUN bash /opt/docker/bin/bootstrap.sh
4040
RUN bash /opt/docker/bin/provision.sh bootstrap
@@ -50,8 +50,8 @@ RUN bash /opt/docker/bin/customization.sh
5050
# Config
5151
##
5252

53-
COPY entrypoint.sh /entrypoint.sh
54-
COPY conf /opt/docker/conf/
53+
COPY entrypoint.sh /entrypoint.sh
54+
COPY conf /opt/docker/conf/
5555

5656
EXPOSE 9000
5757

0 commit comments

Comments
 (0)