Skip to content

Commit 1f820ce

Browse files
mblaschkemblaschke
committed
Cleanup common docker main container
1 parent f356b0c commit 1f820ce

File tree

18 files changed

+29
-181
lines changed

18 files changed

+29
-181
lines changed

‎docker/main/centos/bin/customization.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docker/main/centos/bin/dnsmasq.sh‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎docker/main/centos/bin/logwatch.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docker/main/centos/bin/provision.sh‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎docker/main/centos/entrypoint.sh‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎docker/main/centos/htdocs/.gitkeep‎

Whitespace-only changes.

‎docker/main/ubuntu/Ubuntu-12.04‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ ENV LC_ALL en_US.UTF-8
2424
# Bootstrap
2525
##
2626

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/
27+
COPY conf/ubuntu/locale.conf /opt/docker/locale.conf
28+
COPY bin/ubuntu/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/
3333

3434
RUN bash /opt/docker/bin/bootstrap.sh
3535
RUN bash /opt/docker/bin/provision.sh bootstrap
@@ -46,7 +46,7 @@ RUN bash /opt/docker/bin/customization.sh
4646
##
4747

4848
COPY entrypoint.sh /entrypoint.sh
49-
COPY conf /opt/docker/conf/
49+
COPY conf/ubuntu /opt/docker/conf/
5050

5151
EXPOSE 9000
5252

‎docker/main/ubuntu/Ubuntu-14.04‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ ENV LC_ALL en_US.UTF-8
2424
# Bootstrap
2525
##
2626

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/
27+
COPY conf/ubuntu/locale.conf /opt/docker/locale.conf
28+
COPY bin/ubuntu/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/
3333

3434
RUN bash /opt/docker/bin/bootstrap.sh
3535
RUN bash /opt/docker/bin/provision.sh bootstrap
@@ -46,7 +46,7 @@ RUN bash /opt/docker/bin/customization.sh
4646
##
4747

4848
COPY entrypoint.sh /entrypoint.sh
49-
COPY conf /opt/docker/conf/
49+
COPY conf/ubuntu /opt/docker/conf/
5050

5151
EXPOSE 9000
5252

‎docker/main/ubuntu/Ubuntu-15.04‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ ENV LC_ALL en_US.UTF-8
2424
# Bootstrap
2525
##
2626

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/
27+
COPY conf/ubuntu/locale.conf /opt/docker/locale.conf
28+
COPY bin/ubuntu/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/
3333

3434
RUN bash /opt/docker/bin/bootstrap.sh
3535
RUN bash /opt/docker/bin/provision.sh bootstrap
@@ -46,7 +46,7 @@ RUN bash /opt/docker/bin/customization.sh
4646
##
4747

4848
COPY entrypoint.sh /entrypoint.sh
49-
COPY conf /opt/docker/conf/
49+
COPY conf/ubuntu /opt/docker/conf/
5050

5151
EXPOSE 9000
5252

‎docker/main/ubuntu/Ubuntu-15.10‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ ENV LC_ALL en_US.UTF-8
2424
# Bootstrap
2525
##
2626

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/
27+
COPY conf/ubuntu/locale.conf /opt/docker/locale.conf
28+
COPY bin/ubuntu/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/
3333

3434
RUN bash /opt/docker/bin/bootstrap.sh
3535
RUN bash /opt/docker/bin/provision.sh bootstrap
@@ -46,7 +46,7 @@ RUN bash /opt/docker/bin/customization.sh
4646
##
4747

4848
COPY entrypoint.sh /entrypoint.sh
49-
COPY conf /opt/docker/conf/
49+
COPY conf/ubuntu /opt/docker/conf/
5050

5151
EXPOSE 9000
5252

0 commit comments

Comments
 (0)