Main

devops/docker/local/client_app/Dockerfile

@@ -1,28 +1,28 @@
-# Dockerfile
-FROM node:18.12.1-alpine
+# Use Node.js LTS (Long Term Support) image
+FROM node:18.20.5-alpine AS base
 
-# create destination directory
-RUN mkdir -p /app
+# Create app directory
 WORKDIR /app
 
-# update and install dependency
-RUN apk update && apk upgrade
-RUN apk add git
+# Copy package files
+COPY package*.json ./
 
-# copy the app, note .dockerignore
-COPY . /app/
-# Install the dependencies
-RUN yarn install
+# Install dependencies
+RUN npm install
+RUN npm install --save-dev @babel/plugin-proposal-private-property-in-object
 
-RUN yarn install --save-dev @babel/plugin-proposal-private-property-in-object
+# Run
+FROM base
 
-RUN yarn run build
+COPY --from=base /app/node_modules /app/node_modules
 
+# Expose the development port
 EXPOSE 3000
 
-ENV NUXT_HOST=0.0.0.0
-ENV NUXT_PORT=3000
-# Set the NODE_OPTIONS environment variable
+# Set host to allow external connections
+ENV HOST=0.0.0.0
+ENV PORT=3000
 ENV NODE_OPTIONS="--openssl-legacy-provider"
 
-CMD [ "npm", "start" ]
+# Start development server
+CMD ["npm", "run", "dev"]

devops/docker/local/nginx/Dockerfile

@@ -1,50 +1,8 @@
-FROM node:18.12.1-alpine as build
-
-# Set the working directory inside the container
-WORKDIR /app
-
-# Copy the package.json and package-lock.json files to the container
-COPY package*.json ./
-
-# Install the dependencies
-RUN npm install
-
-RUN npm install --save-dev @babel/plugin-proposal-private-property-in-object
-
-# Set the NODE_OPTIONS environment variable
-ENV NODE_OPTIONS="--openssl-legacy-provider"
-
-
-# Copy the entire app directory to the container
-COPY . .
-
-# Generate the Nuxt.js static files
-RUN npm version patch --git-tag-version false && npx nuxt generate
-
 # Use the official Nginx image as the base image
 FROM nginx:1.22.1
 
-ARG ENV_TYPE
-ARG WEB_FOLDER
-
 # WORKDIR /var/www/indrz
 WORKDIR /usr/share/nginx/html
 
-# COPY devops/docker/local/nginx/conf/allowed.conf /etc/nginx/allowed.conf
-# COPY devops/docker/local/nginx/conf/locations.conf /etc/nginx/locations.conf
-
-
 # Copy the NGINX configuration file to the container
 COPY devops/docker/local/nginx/conf/default-dev.conf /etc/nginx/conf.d/default.conf
-
-# RUN mkdir -p /var/www/indrz
-
-# Copy the built static site from the previous stage to the container
-#COPY --from=build ./app/dist/ /var/www/indrz
-COPY --from=build ./app/dist /usr/share/nginx/html
-
-# Expose port 80
-# EXPOSE 80
-
-# Start Nginx when the container starts
-# CMD ["nginx", "-g", "daemon off;"]

devops/docker/local/nginx/conf/default-dev.conf

@@ -9,6 +9,15 @@ server {
     # set client max upload body size to#
     client_max_body_size 50M;
 
+    location / {
+		proxy_pass http://frontend:3000;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# 		root /usr/share/nginx/html;
+#       index index.html index.htm;
+    }
+
     # API Django backend
     location /api {
         proxy_pass http://indrz_api:8000;
@@ -42,11 +51,6 @@ server {
         proxy_set_header X-Script-Name /geoserver;
     }
 
-	location / {
-		# root /var/www/indrz;
-		root /usr/share/nginx/html;
-        index index.html index.htm;
-    }
 
     error_page 500 502 503 504 /50x.html;
     location = /50x.html {