went to stage 2. changed yml to not include nginx

mdunnmon · mdunnmon · commit 9885716e9de7 · 2023-03-27T15:11:53.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -87,8 +87,8 @@ jspm_packages/
 build/
 release-builds/
 
-.docker-compose.yml
-.Dockerfile-2stage
+.docker-compose-nginx.yml
+.Dockerfile-1stage
 .Dockerfile-nginx
 
 # TypeScript v1 declaration files
diff --git a/Dockerfile b/Dockerfile
@@ -1,31 +1,36 @@
-FROM node:19-alpine
+# Stage 1: Build
+FROM node:19-alpine as build
 
-#python: required dependency for node alpine, shrinks image size from 2.17GB to 1.67GB
+# python: required dependency for node alpine, shrinks image size from 2.17GB to 1.67GB
 RUN apk add --no-cache --virtual .gyp \
     python3 \
     make \
-    g++ 
+    g++
 
 WORKDIR /app
 
 COPY package*.json ./
 
-COPY app/dist /app
+RUN npm install --no-install-recommends
 
-# COPY .env .env
+COPY . .
 
-COPY server ./server
+# Stage 2: Runtime
+FROM node:19-alpine as runtime
 
-COPY config.js ./config.js
+WORKDIR /app
 
-RUN npm install --no-install-recommends
+COPY --from=build /app/package*.json ./
+
+RUN npm install --no-install-recommends --only=production
+
+COPY --from=build /app/.env .env
+COPY --from=build /app/config.js ./config.js
+COPY --from=build /app/server ./server
+COPY --from=build /app/app/dist /app
 
 EXPOSE 5656
 
 ENV IS_DOCKER true
 
 CMD [ "npm", "start" ]
-
-# create docker image: "docker build -t reactype-container ." Note: if you want reactype-container with a different name (must be all lowercase)
-# run docker container: "docker run -d -p 5656:5656 reactype-container" docker run -d -p 5656:5656 reactype-v15
-# comment out window.api.formatCode(), but will break it for electron app.
diff --git a/app/dist/index-prod.html b/app/dist/index-prod.html
@@ -1 +1 @@
-<!doctype html><html lang="en-US"><head><meta charset="UTF-8"/><script src="https://kit.fontawesome.com/7e1cebd082.js" crossorigin="anonymous"></script><meta property="csp-nonce" content="NTVhMWZiNjQtNTNiMi00NTE3LTkwMDItMTdmZWJlMzJkOTZk"/><title>ReacType</title><link href="main.css" rel="stylesheet"></head><body><div id="app"></div><script src="bundle.js"></script></body></html>
+<!doctype html><html lang="en-US"><head><meta charset="UTF-8"/><script src="https://kit.fontawesome.com/7e1cebd082.js" crossorigin="anonymous"></script><meta property="csp-nonce" content="MGMzMmNhN2QtOGMxZi00YTllLTlhODQtMGM0ZWMxYTE4ZGJh"/><title>ReacType</title><link href="main.css" rel="stylesheet"></head><body><div id="app"></div><script src="bundle.js"></script></body></html>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3'
+
+services:
+  web:
+    build:
+      context: .
+      target: runtime
+    ports:
+      - '80:80'
+  api:
+    build:
+      context: .
+      target: build
+    ports:
+      - '5656:5656'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<!doctype html><html lang="en-US"><head><meta charset="UTF-8"/><script src="https://kit.fontawesome.com/7e1cebd082.js" crossorigin="anonymous"></script><meta property="csp-nonce" content="NTVhMWZiNjQtNTNiMi00NTE3LTkwMDItMTdmZWJlMzJkOTZk"/><title>ReacType</title><link href="main.css" rel="stylesheet"></head><body><div id="app"></div><script src="bundle.js"></script></body></html>`
	`1`	`+<!doctype html><html lang="en-US"><head><meta charset="UTF-8"/><script src="https://kit.fontawesome.com/7e1cebd082.js" crossorigin="anonymous"></script><meta property="csp-nonce" content="MGMzMmNhN2QtOGMxZi00YTllLTlhODQtMGM0ZWMxYTE4ZGJh"/><title>ReacType</title><link href="main.css" rel="stylesheet"></head><body><div id="app"></div><script src="bundle.js"></script></body></html>`