Merge pull request #58 from SafeExamBrowser/SEBSERV-832__simplify-proxy-server

SEBSERV-832: simplify proxy server

Author: anhefti

.github/workflows/auto-test-deploy.yml

@@ -6,7 +6,6 @@ on:
       - "auto-testing-deploy"
 
 jobs:
-
   shai-hulud-detector:
     runs-on: ubuntu-latest
     steps:
@@ -27,12 +26,11 @@ jobs:
           chmod +x ./hulud/shai-hulud-detector.sh
           ./hulud/shai-hulud-detector.sh ./seb
 
-
   build-and-push-admin-auto-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag_suffix: [ "", "-single-host" ]
+        tag_suffix: ["", "-single-host"]
         include:
           - tag_suffix: ""
             path_name: ""
@@ -63,7 +61,6 @@ jobs:
           context: .
           push: true
           tags: docker.io/${{ secrets.DOCKERHUB_ADMIN_USERNAME }}/seb-server-gui-auto-testing:${{ env.TAG_NAME }}
-          build-args: VITE_SUB_PATH=${{ matrix.path_name }}
 
   build-and-push-auto-test-storybook:
     runs-on: ubuntu-latest

.github/workflows/docker-build-push.yml

@@ -65,7 +65,6 @@ jobs:
           context: .
           push: true
           tags: docker.io/naritter/seb-server-gui:${{ env.TAG_NAME }}
-          build-args: VITE_SUB_PATH=${{ matrix.path_name }}
 
   build-and-push-admin:
     needs: shai-hulud-detector
@@ -103,4 +102,3 @@ jobs:
           context: .
           push: true
           tags: docker.io/${{ secrets.DOCKERHUB_ADMIN_USERNAME }}/seb-server-gui:${{ env.TAG_NAME }}
-          build-args: VITE_SUB_PATH=${{ matrix.path_name }}

.gitignore

@@ -6,6 +6,7 @@ bin-release/
 
 # Other files and folders
 .settings/
+application-prod.properties
 
 # Executables
 *.swf

Dockerfile

@@ -1,39 +1,28 @@
-# Stage 1: Build the Vue app
-FROM node:22.2.0 as client-builder
+# Build client
+FROM node:22.12.0 AS client-builder
 WORKDIR /app/client
 COPY client/package*.json ./
-RUN npm install
+RUN npm ci
 COPY client/ .
-
-# Inject environment variables for Vue.js
-ARG VITE_SUB_PATH
-RUN echo "VITE_SUB_PATH=$VITE_SUB_PATH" > .env
-
 RUN npm run build
 
-# Stage 2: Build the Express server
-FROM node:22.2.0 as server-builder
+# Build server
+FROM node:22.12.0 AS server-builder
 WORKDIR /app/server
 COPY server/package*.json ./
-RUN npm install
-RUN npm install typescript
+RUN npm ci
 COPY server/ .
 RUN npm run build
 
-# Stage 3: Create the final image
-FROM node:22.2.0-alpine
+# Create final image
+FROM node:22.12.0-alpine
 WORKDIR /app 
+ENV SERVE_CLIENT=true
 COPY --from=server-builder /app/server/dist ./server/dist
 COPY --from=client-builder /app/client/dist ./server/dist/views
-COPY --from=client-builder /app/client/.env ./server/dist/views
-COPY server/package*.json ./
-RUN npm install
-
-# Stage 4: Copy env-var bash script
-COPY env.sh /app/env.sh
-RUN chmod +x /app/env.sh
+COPY --from=server-builder /app/server/node_modules ./node_modules
 
 EXPOSE 3001
 
-# Start the server
-CMD ["/bin/sh", "-c", "./env.sh && node ./server/dist/app.js"]
+# Start server
+CMD ["node", "./server/dist/index.js"]

README.md

@@ -8,42 +8,36 @@ This is a sub-project of SEB Server. For full usage and installation, please vis
 
 **This project is still under development and has not yet an official release or release data.**
 
-This project consists of two parts. A client component and a server component. The server contains no businesses logic but serves as a lightweight api-gateway between the client and the [SEB-Server](https://github.com/SafeExamBrowser/seb-server). The easiest way to build and deploy the project is via docker.
+This project consists of two parts. A client component and a server component. The server contains no businesses logic but serves as a lightweight api gateway. The easiest way to build and deploy the project is via docker.
 
-### Client
+# Development Setup
 
-The client uses the following technologies:
+## Intro
 
-#### [VueJs Version 3.4.\*](https://vuejs.org/)
+If you're just working on the frontend part (SEB Server GUI), this is the easiest way to have a working environment. This pulls the backend services (mariadb, seb-server and sps-webservice) from existing images
 
-- Composition API and Script Setup Syntax
-- Typescript
-- [Vuetify](https://vuetifyjs.com/en/) as the componenet framework
+## Setup docker containers
 
-### Server
+1. Run `docker-compose up -d`
 
-The server uses the following technologies:
+## Setup the client
 
-#### [ExpressJs Version 4.19.\*](https://expressjs.com/)
+1. `cd client`
+1. Start virtual node env: `nvm use`
+1. Install dependencies: `npm ci`
+1. Copy the example `.env` file and adapt it to your needs: `cp .env.example .env`
+1. Start the client: `npm run dev`
 
-- Typescript
-- Axios as API-Request library
+## Setup the server
 
-# Development Setup
+1. See `README.md` in `/server`
 
-## Intro
+## Confirm setup worked
 
-If you're just working on the frontend part (SEB Server GUI), this is the easiest way to have a working environment. This pulls the backend services (mariadb, seb-server and sps-webservice) from existing images. The frontend services (fe-server and fe-client) are built from the local code of this repository.
-
-## Setup docker containers
-
-1. Run `docker-compose up -d`
 1. Visit http://localhost:8082 and login to confirm that the full setup works
 
 ## Install the pre-commit hook
 
-The following steps have to be done on your **host machine** (not in the docker-container)
-
 1. Run `cd client && nvm use && npm run prepare`
 1. Run `git config core.hooksPath` and verify, that the `hooksPath` was correctly set to `./client/.husky/_`
 

client/.env

@@ -0,0 +1 @@
+VITE_DEV_API_SERVER_TARGET=http://localhost:3001

client/.env.example

@@ -4,6 +4,7 @@ node_modules
 .vscode
 
 # local env files
+.env
 .env.local
 .env.*.local
 

client/.gitignore

@@ -1 +1 @@
-v22.2.0
+v22.12.0