Cleanup

Author: joppekoers

deployment/docker-compose.yaml

@@ -1,38 +1,38 @@
 version: "3.7"
 services:
-  frontend:
-    container_name: frontend
+  canvas-frontend:
+    container_name: canvas-frontend
     image: ghcr.io/pixelcorp-nl/canvas.edu/canvas.edu
     restart: unless-stopped
     ports:
       - 80:5173
     env_file:
       - .env
     depends_on:
-      - redis
-      - postgres
-      - datadog-agent
+      - canvas-redis
+      - canvas-postgres
+      - canvas-datadog-agent
 
-  postgres:
-    container_name: postgres
+  canvas-postgres:
+    container_name: canvas-postgres
     restart: unless-stopped
-    image: postgres:alpine
+    image: postgres:17.2-alpine3.21
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
       - 5432:5432
     volumes:
       - ./postgres-db:/var/lib/postgresql/data
 
-  redis:
-    container_name: redis
-    image: redis:alpine
+  canvas-redis:
+    container_name: canvas-redis
+    image: redis:7.4.2-alpine
     restart: unless-stopped
     volumes:
       - ./redis-db:/data
 
-  datadog-agent:
-    container_name: datadog-agent
+  canvas-datadog-agent:
+    container_name: canvas-datadog-agent
     image: gcr.io/datadoghq/agent:latest
     pid: host
     volumes:
@@ -45,14 +45,14 @@ services:
     ports:
       - 8125:8125/udp
 
-  cloudflared:
-    container_name: cloudflared
+  canvas-cloudflared:
+    container_name: canvas-cloudflared
     image: cloudflare/cloudflared
     restart: unless-stopped
     command: tunnel --no-autoupdate run --token <token>
 
-  watchtower:
-    container_name: watchtower
+  canvas-watchtower:
+    container_name: canvas-watchtower
     image: containrrr/watchtower
     restart: unless-stopped
     volumes:

frontend/Dockerfile

@@ -16,7 +16,7 @@ FROM node:18-alpine AS main
 ENV NODE_ENV=production
 ENV PORT=5173
 WORKDIR /app
-HEALTHCHECK --interval=5s --timeout=1s --start-period=1s --retries=3 CMD wget -q -O - http://127.0.0.1:5173/health
+HEALTHCHECK --timeout=1s --start-period=1s --retries=3 CMD wget -q -O - http://127.0.0.1:5173/health
 
 COPY --from=builder-main /app/package.json ./package.json
 # COPY --from=builder-main /app/node_modules ./node_modules

tests/js_example.js

@@ -1,28 +1,14 @@
 // Run with node js_example.js
 
-// Define the URL of the API endpoint and the request headers
-const url = "http://pixelcorp.nl/api/single";
+const url = 'https://pixelcorp.nl/api/single';
 const headers = { 'Content-Type': 'application/json' };
 
-// Define the pixel data as a JavaScript object
-const pixel = { x: 42, y: 42, color: [255, 25, 0] };
+const pixel = { x: 42, y: 42, color: [255, 25, 0], key: 'joppe' };
 
-// Send a POST request to the API endpoint with the pixel data as JSON
 fetch(url, {
-  method: 'POST',
-  headers: headers,
-  body: JSON.stringify(pixel)
-})
-  .then(response => {
-    // Check if the request was successful
-    if (response.ok) {
-      // If the request was successful, print a success message
-      console.log("Pixel successfully changed!");
-    } else {
-      // If the request was unsuccessful, print an error message that includes the HTTP status code
-      console.log("Failed to change pixel:", response.status);
-    }
-  })
-  .catch(error => {
-    console.log("Error:", error);
-  });
+	method: 'POST',
+	headers: headers,
+	body: JSON.stringify(pixel),
+}).then((response) => {
+	response.text().then((text) => console.log(text));
+});