Merge pull request #120 from kristo-baricevic/main

Installing Testing Packages

.github/workflows/containers-publish.yml

@@ -1,8 +1,16 @@
+<<<<<<< HEAD
+name: 'Containers: Publish'
+
+on:
+  push:
+    tags: [ 'v*' ]
+=======
 name: "Containers: Publish"
 
 on:
   push:
     tags: ["v*"]
+>>>>>>> afb000d3a3ee90a677a2580d82fe3a432d1c1933
 
 permissions:
   packages: write
@@ -12,6 +20,48 @@ jobs:
     name: Build and Push
     runs-on: ubuntu-latest
     steps:
+<<<<<<< HEAD
+
+    - uses: actions/checkout@v3
+
+    - name: Login to ghcr.io Docker registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Compute Docker container image addresses
+      run: |
+        DOCKER_REPOSITORY="ghcr.io/${GITHUB_REPOSITORY,,}"
+        DOCKER_TAG="${GITHUB_REF:11}"
+
+        echo "DOCKER_REPOSITORY=${DOCKER_REPOSITORY}" >> $GITHUB_ENV
+        echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV
+
+        echo "Using: ${DOCKER_REPOSITORY}/*:${DOCKER_TAG}"
+
+    # - name: 'Pull previous Docker container image: :latest'
+    #   run: docker pull "${DOCKER_REPOSITORY}:latest" || true
+
+    - name: 'Pull previous Docker container image: frontend-static:latest'
+      run: docker pull "${DOCKER_REPOSITORY}/frontend-static:latest" || true
+
+    - name: 'Build Docker container image: frontend-static:latest'
+      run: |
+        docker build \
+            --cache-from "${DOCKER_REPOSITORY}/frontend-static:latest" \
+            --file frontend/Dockerfile.demo \
+            --build-arg SERVER_NAME=localhost \
+            --tag "${DOCKER_REPOSITORY}/frontend-static:latest" \
+            --tag "${DOCKER_REPOSITORY}/frontend-static:${DOCKER_TAG}" \
+            frontend
+    - name: 'Push Docker container image frontend-static:latest'
+      run: docker push "${DOCKER_REPOSITORY}/frontend-static:latest"
+
+    - name: 'Push Docker container image frontend-static:v*'
+      run: docker push "${DOCKER_REPOSITORY}/frontend-static:${DOCKER_TAG}"
+=======
       - uses: actions/checkout@v3
 
       - name: Login to ghcr.io Docker registry
@@ -51,6 +101,7 @@ jobs:
 
       - name: "Push Docker container image frontend-static:v*"
         run: docker push "${DOCKER_REPOSITORY}/frontend-static:${DOCKER_TAG}"
+>>>>>>> afb000d3a3ee90a677a2580d82fe3a432d1c1933
 #
 #
 #    - name: 'Build Docker container image: backend:latest'
@@ -65,5 +116,10 @@ jobs:
 #    - name: Push Docker container image backend:v*
 #      run: docker push "${DOCKER_REPOSITORY}/backend:${DOCKER_TAG}"
 
+<<<<<<< HEAD
+    # - name: Push Docker container image :v*"
+    #   run: docker push "${DOCKER_REPOSITORY}:${DOCKER_TAG}"
+=======
 # - name: Push Docker container image :v*"
 #   run: docker push "${DOCKER_REPOSITORY}:${DOCKER_TAG}"
+>>>>>>> afb000d3a3ee90a677a2580d82fe3a432d1c1933

.github/workflows/release-prepare.yml

@@ -1,18 +1,37 @@
+<<<<<<< HEAD
+name: 'Release: Prepare PR'
+
+on:
+  push:
+    branches: [ develop ]
+=======
 name: "Release: Prepare PR"
 
 on:
   push:
     branches: [develop]
+>>>>>>> afb000d3a3ee90a677a2580d82fe3a432d1c1933
 
 permissions:
   contents: read
   pull-requests: write
 
 jobs:
   release-prepare:
+<<<<<<< HEAD
+
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: JarvusInnovations/infra-components@channels/github-actions/release-prepare/latest
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        release-branch: main
+=======
     runs-on: ubuntu-latest
     steps:
       - uses: JarvusInnovations/infra-components@channels/github-actions/release-prepare/latest
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           release-branch: main
+>>>>>>> afb000d3a3ee90a677a2580d82fe3a432d1c1933

.github/workflows/release-publish.yml

@@ -1,3 +1,21 @@
+<<<<<<< HEAD
+name: 'Release: Publish PR'
+
+on:
+  pull_request:
+    branches: [ main ]
+    types: [ closed ]
+
+jobs:
+  release-publish:
+
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: JarvusInnovations/infra-components@channels/github-actions/release-publish/latest
+      with:
+        github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
+=======
 name: "Release: Publish PR"
 
 on:
@@ -12,3 +30,4 @@ jobs:
       - uses: JarvusInnovations/infra-components@channels/github-actions/release-publish/latest
         with:
           github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
+>>>>>>> afb000d3a3ee90a677a2580d82fe3a432d1c1933

.github/workflows/release-validate.yml

@@ -1,3 +1,21 @@
+<<<<<<< HEAD
+name: 'Release: Validate PR'
+
+on:
+  pull_request:
+    branches: [ main ]
+    types: [ opened, edited, reopened, synchronize ]
+
+jobs:
+  release-validate:
+
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: JarvusInnovations/infra-components@channels/github-actions/release-validate/latest
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+=======
 name: "Release: Validate PR"
 
 on:
@@ -12,3 +30,4 @@ jobs:
       - uses: JarvusInnovations/infra-components@channels/github-actions/release-validate/latest
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+>>>>>>> afb000d3a3ee90a677a2580d82fe3a432d1c1933

Dockerfile.prod

@@ -0,0 +1,71 @@
+###########
+# BUILDER #
+###########
+
+# pull official base image
+FROM python:3.11.4-slim-buster as builder
+
+# set work directory
+WORKDIR /usr/src/app
+
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+# install system dependencies
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends gcc
+
+# lint
+# RUN pip install --upgrade pip
+# RUN pip install flake8==6.0.0
+# COPY . /usr/src/app/
+# RUN flake8 --ignore=E501,F401 .
+
+# install python dependencies
+COPY ./requirements.txt .
+RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt
+
+
+#########
+# FINAL #
+#########
+
+# pull official base image
+FROM python:3.11.4-slim-buster
+
+# create directory for the app user
+RUN mkdir -p /home/app
+
+# create the app user
+RUN addgroup --system app && adduser --system --group app
+
+# create the appropriate directories
+ENV HOME=/home/app
+ENV APP_HOME=/home/app/web
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
+
+# install dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends netcat
+COPY --from=builder /usr/src/app/wheels /wheels
+COPY --from=builder /usr/src/app/requirements.txt .
+RUN pip install --upgrade pip
+RUN pip install --no-cache /wheels/*
+
+# copy entrypoint.prod.sh
+COPY ./entrypoint.prod.sh .
+RUN sed -i 's/\r$//g'  $APP_HOME/entrypoint.prod.sh
+RUN chmod +x  $APP_HOME/entrypoint.prod.sh
+
+# copy project
+COPY . $APP_HOME
+
+# chown all the files to the app user
+RUN chown -R app:app $APP_HOME
+
+# change to the app user
+USER app
+
+# run entrypoint.prod.sh
+ENTRYPOINT ["/home/app/web/entrypoint.prod.sh"]

babel.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+    presets: [
+      ['@babel/preset-env', { targets: { node: 'current' } }],
+      '@babel/preset-typescript',
+      '@babel/preset-react',
+    ],
+  };
+

docker-compose.yml → docker-compose.dev.yml

@@ -13,21 +13,21 @@ services:
     networks:
       app_net:
         ipv4_address: 192.168.0.2  
-  # pgadmin:
-  #   container_name: pgadmin4
-  #   image: dpage/pgadmin4
-  #   environment:
-  #     PGADMIN_DEFAULT_EMAIL: [email protected]
-  #     PGADMIN_DEFAULT_PASSWORD: balancer
-  #     # PGADMIN_LISTEN_PORT = 80
-  #   # volumes:
-  #   #   - ./pgadmin-data:/var/lib/pgadmin
-  #   #       # PGADMIN_LISTEN_PORT = 80
-  #   ports:
-  #     - "5050:80"
-  #   networks:
-  #     app_net:
-  #       ipv4_address: 192.168.0.4
+  pgadmin:
+    container_name: pgadmin4
+    image: dpage/pgadmin4
+    environment:
+      PGADMIN_DEFAULT_EMAIL: [email protected]
+      PGADMIN_DEFAULT_PASSWORD: balancer
+      # PGADMIN_LISTEN_PORT = 80
+    # volumes:
+    #   - ./pgadmin-data:/var/lib/pgadmin
+    #       # PGADMIN_LISTEN_PORT = 80
+    ports:
+      - "5050:80"
+    networks:
+      app_net:
+        ipv4_address: 192.168.0.3
   backend:
     image: balancer-backend
     build: ./server
@@ -42,7 +42,7 @@ services:
       - ./server:/usr/src/server
     networks:
       app_net:
-        ipv4_address: 192.168.0.3
+        ipv4_address: 192.168.0.4
   frontend:
     image: balancer-frontend
     build:

docker-compose.prod.yml

@@ -21,6 +21,8 @@ services:
       - ./config/env/env.dev
     depends_on:
       - db
+<<<<<<< HEAD
+=======
   frontend:
     image: balancer-frontend
     build:
@@ -38,6 +40,7 @@ services:
         - "/usr/src/app/node_modules/"
     depends_on:
       - backend
+>>>>>>> ac68347c12ced724206112843623ee8c515bd3ad
 
 volumes:
   postgres_data:

frontend/.gitignore

@@ -24,5 +24,3 @@ config/env/env.dev
 *.njsproj
 *.sln
 *.sw?
-
-.DS_Store

frontend/Dockerfile.demo

@@ -0,0 +1,38 @@
+# This dockerfile builds an image for a static frontend only server suitable for online hosting.
+# Use the official Node.js image as the base image
+FROM node:18 as builder
+
+# Set the working directory inside the container
+WORKDIR /usr/src/app
+
+# Copy package.json and package-lock.json
+COPY package*.json ./
+
+# Set version number
+ARG FRONTEND_VERSION
+RUN npm version $FRONTEND_VERSION
+
+# Install dependencies
+RUN npm ci --legacy-peer-deps
+
+# Copy project files
+COPY . .
+
+RUN npm run build
+
+FROM alpine:latest as nginx-config
+RUN apk --no-cache add gettext
+WORKDIR /app
+COPY nginx.conf.demo ./nginx.conf.demo
+# This will get overwritten by helm chart
+
+ARG SERVER_NAME
+ENV SERVER_NAME $SERVER_NAME
+RUN cat nginx.conf.demo | envsubst > nginx.conf
+
+FROM nginx:alpine
+
+COPY --from=nginx-config /app/nginx.conf /etc/nginx/nginx.conf
+COPY --from=Builder /usr/src/app/dist /usr/share/nginx/html
+
+# The default entrypoint works for us.

frontend/Dockerfile → frontend/Dockerfile.dev

@@ -1,4 +1,5 @@
-# Use the official Node.js 14 image as the base image
+# This dockerfile builds an image for a Vite development server
+# Use the official Node.js image as the base image
 FROM node:18
 
 # Set the working directory inside the container
@@ -14,12 +15,12 @@ RUN npm install
 COPY . .
 
 # Build the project
-RUN npm run build
+# RUN npm run build
 
 # Expose a port if required
-EXPOSE 3000
+# EXPOSE 3000
 
-# Start the application
+# Start the dev server
 CMD [ "npm", "run", "dev" ]
 
 # Set the image name