From 9001f31036b5f335cd08867a3350a1cd1acd2a67 Mon Sep 17 00:00:00 2001 From: sid palas Date: Fri, 10 Feb 2023 10:37:13 -0500 Subject: [PATCH] add newlines to end Dockerfiles --- 06-building-container-images/api-golang/Dockerfile.3 | 2 +- 06-building-container-images/api-golang/Dockerfile.4 | 2 +- 06-building-container-images/api-golang/Dockerfile.5 | 2 +- 06-building-container-images/api-golang/Dockerfile.6 | 2 +- 06-building-container-images/api-golang/Dockerfile.7 | 2 +- 06-building-container-images/api-node/Dockerfile.0 | 2 +- 06-building-container-images/api-node/Dockerfile.1 | 2 +- 06-building-container-images/api-node/Dockerfile.2 | 2 +- 06-building-container-images/api-node/Dockerfile.3 | 2 +- 06-building-container-images/api-node/Dockerfile.4 | 2 +- 06-building-container-images/api-node/Dockerfile.5 | 2 +- 06-building-container-images/api-node/Dockerfile.6 | 2 +- 06-building-container-images/api-node/Dockerfile.7 | 4 ---- 06-building-container-images/api-node/Dockerfile.8 | 4 ---- 06-building-container-images/client-react/Dockerfile.0 | 2 +- 06-building-container-images/client-react/Dockerfile.1 | 2 +- 06-building-container-images/client-react/Dockerfile.2 | 2 +- 06-building-container-images/client-react/Dockerfile.3 | 2 +- 06-building-container-images/client-react/Dockerfile.4 | 4 +--- 06-building-container-images/client-react/Dockerfile.5 | 4 +--- 20 files changed, 18 insertions(+), 30 deletions(-) diff --git a/06-building-container-images/api-golang/Dockerfile.3 b/06-building-container-images/api-golang/Dockerfile.3 index a8a840c..ce7b424 100644 --- a/06-building-container-images/api-golang/Dockerfile.3 +++ b/06-building-container-images/api-golang/Dockerfile.3 @@ -14,4 +14,4 @@ COPY . . # Compile application during build rather than at runtime RUN go build -o api-golang -CMD ["./api-golang"] \ No newline at end of file +CMD ["./api-golang"] diff --git a/06-building-container-images/api-golang/Dockerfile.4 b/06-building-container-images/api-golang/Dockerfile.4 index f0e4616..adb295c 100644 --- a/06-building-container-images/api-golang/Dockerfile.4 +++ b/06-building-container-images/api-golang/Dockerfile.4 @@ -27,4 +27,4 @@ WORKDIR / # Copy the binary from the build stage COPY --from=build /app/api-golang api-golang -CMD ["/api-golang"] \ No newline at end of file +CMD ["/api-golang"] diff --git a/06-building-container-images/api-golang/Dockerfile.5 b/06-building-container-images/api-golang/Dockerfile.5 index 2db7523..24654ac 100644 --- a/06-building-container-images/api-golang/Dockerfile.5 +++ b/06-building-container-images/api-golang/Dockerfile.5 @@ -33,4 +33,4 @@ COPY --from=build /app/api-golang api-golang # Indicate expected port EXPOSE 8080 -CMD ["/api-golang"] \ No newline at end of file +CMD ["/api-golang"] diff --git a/06-building-container-images/api-golang/Dockerfile.6 b/06-building-container-images/api-golang/Dockerfile.6 index 926826a..dd66d10 100644 --- a/06-building-container-images/api-golang/Dockerfile.6 +++ b/06-building-container-images/api-golang/Dockerfile.6 @@ -45,4 +45,4 @@ USER nonroot # Indicate expected port EXPOSE 8080 -CMD ["/api-golang"] \ No newline at end of file +CMD ["/api-golang"] diff --git a/06-building-container-images/api-golang/Dockerfile.7 b/06-building-container-images/api-golang/Dockerfile.7 index 4da3482..5c00a6f 100644 --- a/06-building-container-images/api-golang/Dockerfile.7 +++ b/06-building-container-images/api-golang/Dockerfile.7 @@ -55,4 +55,4 @@ USER nonroot # Indicate expected port EXPOSE 8080 -CMD ["/api-golang"] \ No newline at end of file +CMD ["/api-golang"] diff --git a/06-building-container-images/api-node/Dockerfile.0 b/06-building-container-images/api-node/Dockerfile.0 index 7667bfc..c380118 100644 --- a/06-building-container-images/api-node/Dockerfile.0 +++ b/06-building-container-images/api-node/Dockerfile.0 @@ -4,4 +4,4 @@ COPY . . RUN npm install -CMD [ "node", "index.js" ] \ No newline at end of file +CMD [ "node", "index.js" ] diff --git a/06-building-container-images/api-node/Dockerfile.1 b/06-building-container-images/api-node/Dockerfile.1 index 7e3d153..f35a36c 100644 --- a/06-building-container-images/api-node/Dockerfile.1 +++ b/06-building-container-images/api-node/Dockerfile.1 @@ -6,4 +6,4 @@ COPY . . RUN npm install -CMD [ "node", "index.js" ] \ No newline at end of file +CMD [ "node", "index.js" ] diff --git a/06-building-container-images/api-node/Dockerfile.2 b/06-building-container-images/api-node/Dockerfile.2 index e9e76ec..4cdc55a 100644 --- a/06-building-container-images/api-node/Dockerfile.2 +++ b/06-building-container-images/api-node/Dockerfile.2 @@ -9,4 +9,4 @@ COPY . . RUN npm install -CMD [ "node", "index.js" ] \ No newline at end of file +CMD [ "node", "index.js" ] diff --git a/06-building-container-images/api-node/Dockerfile.3 b/06-building-container-images/api-node/Dockerfile.3 index 69e1023..636b301 100644 --- a/06-building-container-images/api-node/Dockerfile.3 +++ b/06-building-container-images/api-node/Dockerfile.3 @@ -15,4 +15,4 @@ RUN npm install # Again, copy only the necessary files COPY ./src/ . -CMD [ "node", "index.js" ] \ No newline at end of file +CMD [ "node", "index.js" ] diff --git a/06-building-container-images/api-node/Dockerfile.4 b/06-building-container-images/api-node/Dockerfile.4 index 2744cec..ce684db 100644 --- a/06-building-container-images/api-node/Dockerfile.4 +++ b/06-building-container-images/api-node/Dockerfile.4 @@ -19,4 +19,4 @@ USER node # Again, copy only the necessary files COPY --chown=node:node ./src/ . -CMD [ "node", "index.js" ] \ No newline at end of file +CMD [ "node", "index.js" ] diff --git a/06-building-container-images/api-node/Dockerfile.5 b/06-building-container-images/api-node/Dockerfile.5 index c1eb61d..cda4e27 100644 --- a/06-building-container-images/api-node/Dockerfile.5 +++ b/06-building-container-images/api-node/Dockerfile.5 @@ -23,4 +23,4 @@ USER node # Again, copy only the necessary files COPY --chown=node:node ./src/ . -CMD [ "node", "index.js" ] \ No newline at end of file +CMD [ "node", "index.js" ] diff --git a/06-building-container-images/api-node/Dockerfile.6 b/06-building-container-images/api-node/Dockerfile.6 index 6c71c95..75f041e 100644 --- a/06-building-container-images/api-node/Dockerfile.6 +++ b/06-building-container-images/api-node/Dockerfile.6 @@ -26,4 +26,4 @@ COPY --chown=node:node ./src/ . # Indicate expected port EXPOSE 3000 -CMD [ "node", "index.js" ] \ No newline at end of file +CMD [ "node", "index.js" ] diff --git a/06-building-container-images/api-node/Dockerfile.7 b/06-building-container-images/api-node/Dockerfile.7 index 47dae87..6ce2a9a 100644 --- a/06-building-container-images/api-node/Dockerfile.7 +++ b/06-building-container-images/api-node/Dockerfile.7 @@ -30,7 +30,3 @@ COPY --chown=node:node ./src/ . EXPOSE 3000 CMD [ "node", "index.js" ] - -# TODO: Use multi-stage with distroless image or chainguard image? -# https://github.com/GoogleContainerTools/distroless/blob/main/examples/nodejs/Dockerfile -# https://edu.chainguard.dev/chainguard/chainguard-images/reference/node/overview/ \ No newline at end of file diff --git a/06-building-container-images/api-node/Dockerfile.8 b/06-building-container-images/api-node/Dockerfile.8 index fb7158a..5e992da 100644 --- a/06-building-container-images/api-node/Dockerfile.8 +++ b/06-building-container-images/api-node/Dockerfile.8 @@ -33,7 +33,3 @@ COPY --chown=node:node ./src/ . EXPOSE 3000 CMD [ "node", "index.js" ] - -# TODO: Use multi-stage with distroless image or chainguard image? -# https://github.com/GoogleContainerTools/distroless/blob/main/examples/nodejs/Dockerfile -# https://edu.chainguard.dev/chainguard/chainguard-images/reference/node/overview/ \ No newline at end of file diff --git a/06-building-container-images/client-react/Dockerfile.0 b/06-building-container-images/client-react/Dockerfile.0 index e80881b..9ce345c 100644 --- a/06-building-container-images/client-react/Dockerfile.0 +++ b/06-building-container-images/client-react/Dockerfile.0 @@ -4,4 +4,4 @@ COPY . . RUN npm install -CMD ["npm", "run", "dev"] \ No newline at end of file +CMD ["npm", "run", "dev"] diff --git a/06-building-container-images/client-react/Dockerfile.1 b/06-building-container-images/client-react/Dockerfile.1 index 6600698..d720973 100644 --- a/06-building-container-images/client-react/Dockerfile.1 +++ b/06-building-container-images/client-react/Dockerfile.1 @@ -4,4 +4,4 @@ COPY . . RUN npm install -CMD ["npm", "run", "dev"] \ No newline at end of file +CMD ["npm", "run", "dev"] diff --git a/06-building-container-images/client-react/Dockerfile.2 b/06-building-container-images/client-react/Dockerfile.2 index 6d535fe..dc490be 100644 --- a/06-building-container-images/client-react/Dockerfile.2 +++ b/06-building-container-images/client-react/Dockerfile.2 @@ -11,4 +11,4 @@ RUN npm install COPY . . -CMD ["npm", "run", "dev"] \ No newline at end of file +CMD ["npm", "run", "dev"] diff --git a/06-building-container-images/client-react/Dockerfile.3 b/06-building-container-images/client-react/Dockerfile.3 index c081ddd..5ebc976 100644 --- a/06-building-container-images/client-react/Dockerfile.3 +++ b/06-building-container-images/client-react/Dockerfile.3 @@ -14,4 +14,4 @@ RUN --mount=type=cache,target=/usr/src/app/.npm \ COPY . . -CMD ["npm", "run", "dev"] \ No newline at end of file +CMD ["npm", "run", "dev"] diff --git a/06-building-container-images/client-react/Dockerfile.4 b/06-building-container-images/client-react/Dockerfile.4 index 6849a60..9d50c14 100644 --- a/06-building-container-images/client-react/Dockerfile.4 +++ b/06-building-container-images/client-react/Dockerfile.4 @@ -23,6 +23,4 @@ COPY nginx.conf /etc/nginx/conf.d/default.conf COPY --from=build usr/src/app/dist/ /usr/share/nginx/html -EXPOSE 80 - -# No CMD specified... will uses CMD/ENTRYPOINT from base image (nginx:1.23-alpine) \ No newline at end of file +EXPOSE 80 \ No newline at end of file diff --git a/06-building-container-images/client-react/Dockerfile.5 b/06-building-container-images/client-react/Dockerfile.5 index 6be8c04..13c1902 100644 --- a/06-building-container-images/client-react/Dockerfile.5 +++ b/06-building-container-images/client-react/Dockerfile.5 @@ -26,6 +26,4 @@ COPY --link nginx.conf /etc/nginx/conf.d/default.conf COPY --link --from=build usr/src/app/dist/ /usr/share/nginx/html -EXPOSE 80 - -# No CMD specified... will uses CMD/ENTRYPOINT from base image (nginx:1.23-alpine) \ No newline at end of file +EXPOSE 80 \ No newline at end of file