Browse Source

Converted apache

tags/v3.0.0
Robin Thoni 5 years ago
parent
commit
7fe0ccc8c7
2 changed files with 2 additions and 9 deletions
  1. 2
    4
      apache/Dockerfile
  2. 0
    5
      apache/bin/run.sh

+ 2
- 4
apache/Dockerfile View File

@@ -1,9 +1,7 @@
1 1
 FROM php:7-apache-stretch
2 2
 
3
-ADD https://raw.githubusercontent.com/robin-thoni/docker-utils/v1.0.0/setup.sh /tmp/docker-utils-setup.sh
3
+ADD https://raw.githubusercontent.com/robin-thoni/docker-utils/v1.1.0/setup.sh /tmp/docker-utils-setup.sh
4 4
 RUN sh /tmp/docker-utils-setup.sh
5
-
6 5
 COPY ./config /etc/salt/base/
7
-COPY ./bin /usr/local/bin/
8 6
 
9
-ENTRYPOINT ["run.sh"]
7
+CMD ["gcf-entrypoint", "apache2-foreground"]

+ 0
- 5
apache/bin/run.sh View File

@@ -1,5 +0,0 @@
1
-#! /bin/bash
2
-
3
-gcf || exit 1
4
-
5
-docker-php-entrypoint apache2-foreground

Loading…
Cancel
Save