Merge pull request #13 from baloise/main

Update docker build
baloise · Oct 30, 2024 · b1ff3b8 · b1ff3b8
2 parents c225679 + 174aa3d
commit b1ff3b8
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,6 +33,9 @@ WORKDIR /app
 # set script permissions
 RUN chmod +x entrypoint.sh setup.sh
 
+RUN adduser -Ds /bin/bash anon && chown -R anon: /app
+USER anon
+
 # run app setup script
 RUN "./setup.sh"
 

diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ install: $(INSTALL_STAMP)
 
 $(INSTALL_STAMP): pyproject.toml
 	@if [ -z $(POETRY) ]; then echo "Poetry could not be found. Please install it."; exit 2; fi
-	$(POETRY) install --only main
+	$(POETRY) install --without dev
 	touch $(INSTALL_STAMP)
 
 # Clean target to remove temporary files and caches

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-# Your entry point logic here
-echo "Running entry point script..."
-
 # Execute the command passed to the container
 echo "$(cat banner.txt)"
-export PATH="$HOME/.local/bin:$PATH"
-make run
+
+if [ -z "$@" ]; then
+    export PATH="$HOME/.local/bin:$PATH"
+    make run
+fi
 
 # Execute the command passed to the container
 exec "$@"
diff --git a/src/static/public/favicon.ico b/src/static/public/favicon.ico
diff --git a/src/static/public/favicon.svg b/src/static/public/favicon.svg
diff --git a/src/static/scripts/script.js b/src/static/scripts/script.js
@@ -12,18 +12,17 @@ document.getElementById('inputForm').addEventListener('submit', function(event)
         headers: {
             'Content-Type': 'application/json',
         },
-        body: JSON.stringify({ text: inputData }), // Send the input data as JSON
+        body: JSON.stringify({ text: inputData }), // Send the input text as JSON
     })
     .then(response => {
         if (!response.ok) {
             throw new Error('Network response was not ok');
         }
         return response.json(); // Parse the JSON response
     })
-    .then(data => {
-        console.log('Success:', data); // Handle the success response
+    .then(text => {
         // Display the response in the textarea
-        document.getElementById('responseField').value = JSON.stringify(data, null, 2); // Format the JSON response
+        document.getElementById('responseField').value = JSON.stringify(text, null, 2); // Format the JSON response
     })
     .catch((error) => {
         console.error('Error:', error); // Handle any errors

diff --git a/src/templates/html/form.html b/src/templates/html/form.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>YoYo MaskR</title>
-    <link rel="icon" type="image/x-icon" href="/static/public/favicon.ico">
+    <link rel="icon" type="image/svg+xml" href="/static/public/favicon.svg">
 </head>
 <body>
     <h3>Input:</h3>