Docker/Cesium updates

.github/workflows/nodejsdeploy.yml

@@ -32,6 +32,8 @@ jobs:
 
             - run: npm install
             - run: npm run build --if-present
+              env:
+                  VUE_APP_CESIUM_TOKEN: ${{ secrets.CESIUM_TOKEN }}
 
             - name: deploy to server
               uses: AEnterprise/rsync-deploy@v1.0.2

Dockerfile

@@ -6,6 +6,9 @@ WORKDIR /usr/src/app
 # Install git (needed for submodules)
 RUN apt-get update && apt-get install -y git
 
+# Create a non-root user
+RUN useradd -m -u 2000 nodeuser
+
 # Copy package files first for better caching
 COPY package*.json ./
 
@@ -23,5 +26,14 @@ RUN git submodule update
 # Run the update-browserslist-db as suggested in the warning
 RUN npx update-browserslist-db@latest
 
+# Change ownership of the app directory to the non-root user
+RUN chown -R nodeuser:nodeuser /usr/src/app
+
+# Switch to non-root user
+USER nodeuser
+
+# Configure git to trust the mounted directory
+RUN git config --global --add safe.directory /usr/src/app
+
 EXPOSE 8080
 CMD [ "npm", "run", "dev" ]

README.md

@@ -44,14 +44,10 @@ or build the docker file locally:
 docker build -t <your username>/uavlogviewer .
 
 # Run Docker Image
-docker run -p 8080:8080 -d <your username>/uavlogviewer
-
-# View Running Containers
-docker ps
-
-# View Container Log
-docker logs <container id>
+docker run -e VUE_APP_CESIUM_TOKEN=<Your cesium ion token> -it -p 8080:8080 -v ${PWD}:/usr/src/app <your username>/uavlogviewer
 
 # Navigate to localhost:8080 in your web browser
 
+# changes should automatically be applied to the viewer
+
 ```

config/dev.env.js

@@ -3,5 +3,6 @@ const { merge } = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  VUE_APP_CESIUM_TOKEN: JSON.stringify(process.env.VUE_APP_CESIUM_TOKEN || '')
 })

config/prod.env.js

@@ -1,4 +1,5 @@
 'use strict'
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  VUE_APP_CESIUM_TOKEN: JSON.stringify(process.env.VUE_APP_CESIUM_TOKEN || '')
 }

src/components/CesiumViewer.vue

@@ -84,9 +84,8 @@ import {
     isPointInPolygon
 } from './cesiumExtra/boundingPolygon.js'
 
-Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwMTIzNmJhM' +
-    'y1jNDE3LTQ0MzAtODVkMS1mZmUzODdjMTg0MGIiLCJpZCI6MzAzNjYzLCJpYXQiOjE3NDc2MjEzOTR9.Eu' +
-    'W7FIgBv2OzYDyy0xfCWiExKyLIK9S4qJoT4D5-qrM'
+// Set Cesium token from environment variable
+Ion.defaultAccessToken = process.env.VUE_APP_CESIUM_TOKEN || ''
 
 const colorCoderMode = new ColorCoderMode(store)
 const colorCoderRange = new ColorCoderRange(store)