Remove trailing * during copy, remove unneeded runs

AEtherC0r3 · Sep 29, 2018 · 08e7673 · 08e7673
1 parent e994e3d
commit 08e7673
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/grnet/mqtt.dockerfile b/grnet/mqtt.dockerfile
@@ -3,7 +3,7 @@
 # Based on Debian
 ############################################################
 
-# Set the base image to Debia
+# Set the base image to Debian
 FROM debian:stretch
 
 ################## BEGIN INSTALLATION ######################

diff --git a/grnet/website.dockerfile b/grnet/website.dockerfile
@@ -2,6 +2,7 @@
 # Dockerfile to build and server LambdaSpace's website
 ############################################################
 
+## Builder
 # Use the Node image to build the website's assets
 FROM node:10-stretch as asset_builder
 
@@ -12,24 +13,16 @@ WORKDIR /new_website
 RUN yarn install
 RUN yarn build
 
-
-# Set the base image to Debian
+## Website container
 FROM nginx:alpine
 
-################## BEGIN INSTALLATION ######################
 RUN apk add --update --no-cache ca-certificates
 
-# Forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log
-RUN ln -sf /dev/stderr /var/log/nginx/error.log
-
+# Copy config from host
 COPY website-nginx.conf /etc/nginx/nginx.conf
-
+# Copy assets from builer
 WORKDIR /usr/share/nginx/html
 RUN rm *
-COPY --from=asset_builder /new_website/* ./
-
-################## INSTALLATION END ######################
+COPY --from=asset_builder /new_website/ ./
 
-EXPOSE 80 443
-CMD nginx -g "daemon off;"
+EXPOSE 80 443