Browse Source

remove techempower/nginx dependency from dart (#3503)

Nate 7 years ago
parent
commit
697ba8111a

+ 1 - 1
frameworks/Dart/start/nginx-conf.sh

@@ -12,7 +12,7 @@ conf+="\tworker_connections 1024;\n"
 conf+="}\n"
 conf+="http {\n"
 conf+="\taccess_log off;\n"
-conf+="\tinclude ${NGINX_HOME}/conf/mime.types;\n"
+conf+="\tinclude /etc/nginx/mime.types;\n"
 conf+="\tdefault_type application/octet-stream;\n"
 conf+="\tsendfile on;\n"
 conf+="\tupstream dart_cluster {\n"

+ 1 - 6
frameworks/Dart/start/start.dockerfile

@@ -1,11 +1,6 @@
-FROM techempower/nginx:0.1
-
 FROM google/dart:1.24
 
-COPY --from=0 /nginx /nginx
-
-ENV NGINX_HOME="/nginx"
-ENV PATH=/nginx/sbin:${PATH}
+RUN apt update -yqq && apt install -yqq nginx
 
 ADD ./ /start
 WORKDIR /start

+ 1 - 1
frameworks/Dart/stream/nginx-conf.sh

@@ -12,7 +12,7 @@ conf+="\tworker_connections 1024;\n"
 conf+="}\n"
 conf+="http {\n"
 conf+="\taccess_log off;\n"
-conf+="\tinclude ${NGINX_HOME}/conf/mime.types;\n"
+conf+="\tinclude /etc/nginx/mime.types;\n"
 conf+="\tdefault_type application/octet-stream;\n"
 conf+="\tsendfile on;\n"
 conf+="\tupstream dart_cluster {\n"

+ 1 - 6
frameworks/Dart/stream/stream.dockerfile

@@ -1,11 +1,6 @@
-FROM techempower/nginx:0.1
-
 FROM google/dart:1.24
 
-COPY --from=0 /nginx /nginx
-
-ENV NGINX_HOME="/nginx"
-ENV PATH=/nginx/sbin:${PATH}
+RUN apt update -yqq && apt install -yqq nginx
 
 ADD ./ /stream
 WORKDIR /stream