Merge pull request #27 from oslabs-beta/mike/ecr

Mike/ecr

Author: GarrettHutson

.Dockerfile-1stage

@@ -0,0 +1,31 @@
+FROM node:19-alpine
+
+#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++ 
+
+WORKDIR /app
+
+COPY package*.json ./
+
+COPY app/dist /app
+
+# COPY .env .env
+
+COPY server ./server
+
+COPY config.js ./config.js
+
+RUN npm install --no-install-recommends
+
+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.

.Dockerfile-nginx

@@ -0,0 +1,48 @@
+# Stage 1: Build
+FROM node:19-alpine as build
+
+# 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++
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm install --no-install-recommends
+
+COPY . .
+
+# Stage 2: Node Server
+FROM node:19-alpine as node_server
+
+WORKDIR /app
+
+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
+
+EXPOSE 5656
+
+ENV IS_DOCKER true
+
+CMD [ "npm", "start" ]
+
+# Stage 3: Nginx Server
+FROM nginx:alpine as nginx_server
+
+# Copy the build output to the Nginx html directory
+COPY --from=build /app/app/dist /usr/share/nginx/html
+
+# Copy the Nginx configuration file
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

.docker-compose-nginx.yml

@@ -0,0 +1,15 @@
+version: '3'
+
+services:
+  web:
+    build:
+      context: .
+      target: nginx_server
+    ports:
+      - '80:80'
+  api:
+    build:
+      context: .
+      target: node_server
+    ports:
+      - '5656:5656'

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+app/electron

.gitignore

@@ -87,6 +87,11 @@ dist/
 build/
 release-builds/
 
+# .docker-compose-nginx.yml
+# .Dockerfile-1stage
+# .Dockerfile-nginx
+# .electron
+
 # TypeScript v1 declaration files
 typings/
 
@@ -496,4 +501,6 @@ server/rootCA.key
 server/rootCA.pem
 server/RootCA.srl
 
+
+
 # End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn

Dockerfile

@@ -0,0 +1,36 @@
+# Stage 1: Build
+FROM node:19-alpine as build
+
+# 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++
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm install --no-install-recommends --fetch-retry-maxtimeout 500000
+
+COPY . .
+
+# Stage 2: Runtime
+FROM node:19-alpine as runtime
+
+WORKDIR /app
+
+COPY --from=build /app/package*.json ./
+
+RUN npm install --no-install-recommends --only=production --fetch-retry-maxtimeout 500000
+
+# 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" ]

app/electron/main.js renamed to app/.electron/main.js

@@ -171,7 +171,8 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
     ) => {
       e.preventDefault();
         // window.api.github();
-        window.location.assign('http://localhost:5656/auth/github');
+        // 8080 for container 5656 for dev
+        window.location.assign('http://localhost:5656/auth/github')
     }
   const responseFacebook = response => {
     if (response.accessToken) {
@@ -303,7 +304,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
               id="SignInWithGoogle"
               onClick={(e)=>{
                 e.preventDefault();
-                window.location.assign('http://localhost:5656/auth/google');
+                window.location.assign('http://localhost:5656/auth/google')
               }}
               sx={{
                 marginBottom: '5px'

app/electron/menu.js renamed to app/.electron/menu.js

@@ -11,8 +11,8 @@ export default function LoginButton() {
   const handleLogout = () => {
     window.localStorage.clear();
     if (process.env.NODE_ENV === 'production') {
-      window.api.delCookie();
-      window.location.href = '/index-prod.html'
+      document.cookie = 'ssid' + '=; Max-Age=0'
+      window.location.href = 'http://localhost:5656/'
     } else {
     window.location.href = 'http://localhost:8080/#/login';
     if(state.isLoggedIn){