From ad52b78b8dd50331cf535a461a1e3ae51cacd97f Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 26 Jan 2021 15:55:34 +0100
Subject: [PATCH] chore: reworking the files so that it's moved to docs instea

---
 .../docker/multi-stage-with-bundle/Dockerfile | 42 ------------
 docs/getting-started/deployment-other.md      | 64 ++++++++++++++++---
 2 files changed, 56 insertions(+), 50 deletions(-)
 delete mode 100644 contrib/docker/multi-stage-with-bundle/Dockerfile

diff --git a/contrib/docker/multi-stage-with-bundle/Dockerfile b/contrib/docker/multi-stage-with-bundle/Dockerfile
deleted file mode 100644
index 8289a49046..0000000000
--- a/contrib/docker/multi-stage-with-bundle/Dockerfile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Stage 1 - Create yarn install skeleton layer
-FROM node:14-buster AS packages
-
-WORKDIR /app
-COPY package.json yarn.lock ./
-
-# Uncomment this line if building a non create-app version
-# COPY packages packages
-COPY plugins plugins
-
-RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
-
-# Stage 2 - Install dependencies and build packages
-FROM node:14-buster AS build
-
-WORKDIR /app
-COPY --from=packages /app .
-
-RUN yarn install --network-timeout 600000 && rm -rf "$(yarn cache dir)"
-
-COPY . .
-
-RUN yarn tsc
-RUN yarn --cwd packages/backend backstage-cli backend:bundle --build-dependencies
-
-# Stage 3 - Build the actual backend image and install production dependencies
-FROM node:14-buster
-
-WORKDIR /app
-
-# Copy from build stage
-COPY --from=build /app/yarn.lock /app/package.json /app/packages/backend/dist/skeleton.tar.gz ./
-RUN tar xzf skeleton.tar.gz && rm skeleton.tar.gz
-
-RUN yarn install --production --network-timeout 600000 && rm -rf "$(yarn cache dir)"
-
-COPY --from=build /app/packages/backend/dist/bundle.tar.gz .
-RUN tar xzf bundle.tar.gz && rm bundle.tar.gz
-
-COPY app-config.yaml app-config.production.yaml ./
-
-CMD ["node", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.production.yaml"]
diff --git a/docs/getting-started/deployment-other.md b/docs/getting-started/deployment-other.md
index 55582ee77a..900173a6c5 100644
--- a/docs/getting-started/deployment-other.md
+++ b/docs/getting-started/deployment-other.md
@@ -4,19 +4,67 @@ title: Other
 description: Documentation on different ways of Deployment
 ---
 
-## Deploying Locally
+## Docker
 
-### Try on Docker
+Here we have an example Dockerfile that you can use to build everything together
+in one container. This Dockerfile uses multi-stage builds, and a
+`backend:bundle` command from the CLI.
 
-Run the following commands if you have Docker environment
+It also provides caching on the `yarn install`'s so that you don't have to do it
+unless absolutely necessary.
 
-```bash
-$ yarn install
-$ yarn docker-build
-$ docker run --rm -it -p 7000:7000 -e APP_ENV=production -e NODE_ENV=development example-backend:latest
+```Dockerfile
+# Stage 1 - Create yarn install skeleton layer
+FROM node:14-buster AS packages
+
+WORKDIR /app
+COPY package.json yarn.lock ./
+
+COPY packages packages
+
+# Uncomment this line if you have a local plugins folder
+# COPY plugins plugins
+
+RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
+
+# Stage 2 - Install dependencies and build packages
+FROM node:14-buster AS build
+
+WORKDIR /app
+COPY --from=packages /app .
+
+RUN yarn install --network-timeout 600000 && rm -rf "$(yarn cache dir)"
+
+COPY . .
+
+RUN yarn tsc
+RUN yarn --cwd packages/backend backstage-cli backend:bundle --build-dependencies
+
+# Stage 3 - Build the actual backend image and install production dependencies
+FROM node:14-buster
+
+WORKDIR /app
+
+# Copy from build stage
+COPY --from=build /app/yarn.lock /app/package.json /app/packages/backend/dist/skeleton.tar.gz ./
+RUN tar xzf skeleton.tar.gz && rm skeleton.tar.gz
+
+RUN yarn install --production --network-timeout 600000 && rm -rf "$(yarn cache dir)"
+
+COPY --from=build /app/packages/backend/dist/bundle.tar.gz .
+RUN tar xzf bundle.tar.gz && rm bundle.tar.gz
+
+COPY app-config.yaml app-config.production.yaml ./
+
+CMD ["node", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.production.yaml"]
 ```
 
-Then open http://localhost:7000 on your browser.
+You can add the Dockerfile to the root of your project, and run the following:
+
+```sh
+$ docker build -t eaxmple-deployment .
+$ docker run -p 7000:7000 example-deployment
+```
 
 ## Heroku