Merging @erikap's branch with @benjay10's

benjay10 · madnificent · commit 84e61957015d · 2024-02-17T20:52:40.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,28 @@
-FROM nginx:1.15.8
-LABEL maintainer="erika.pauwels@gmail.com"
+FROM node:16-alpine as builder
 
-ENV ENABLE_ENDPOINT_SELECTOR false
-ENV DEFAULT_SPARQL_ENDPOINT http://localhost/sparql
+LABEL maintainer="info@redpencil.io"
 
-COPY index.html /usr/share/nginx/html/
-COPY startup.sh /
-RUN chmod +x /startup.sh
+RUN apk add bash
+RUN apk add git
+RUN apk add yarn
+RUN mkdir /app
+WORKDIR /app
+RUN git clone https://github.com/TriplyDB/Yasgui.git
+WORKDIR /app/Yasgui
+RUN yarn install
+RUN yarn run build
 
-ENTRYPOINT ["/startup.sh"]
+FROM httpd:alpine3.19
 
-CMD ["nginx", "-g", "daemon off;"]
+WORKDIR /usr/local/apache2/htdocs
+COPY --from=builder /app/Yasgui/build .
+COPY --from=builder /app/Yasgui/packages/yasgui/static/yasgui.polyfill.min.js .
+COPY --from=builder /app/Yasgui/webpack/yasgui.png .
+COPY ./index-replacement.html .
+COPY ./FixHostedFiles.sh /
+COPY ./startup.sh /
+RUN sh /FixHostedFiles.sh
+
+ENV DEFAULT_SPARQL_ENDPOINT http://localhost:8890/sparql
+ENTRYPOINT ["sh", "/startup.sh"]
+CMD ["httpd-foreground"]
diff --git a/FixHostedFiles.sh b/FixHostedFiles.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd /usr/local/apache2/htdocs
+rm index.html yasgui.html yasr.html yasqe.html
+mv index-replacement.html index.html
+
diff --git a/index-replacement.html b/index-replacement.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" type="image/x-icon" href="yasgui.png">
+    <style>
+      body {
+        font-family: 'Roboto', sans-serif;
+        margin: 0px;
+      }
+    </style>
+    <script src="./yasgui.polyfill.min.js"></script>
+    <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+    <title>YASGUI</title>
+    <link href="/yasgui.min.css" rel="stylesheet">
+    <link href="/yasqe.min.css" rel="stylesheet">
+    <link href="/yasr.min.css" rel="stylesheet">
+  </head>
+  <body>
+    <div id="yasgui"></div>
+    <script>
+      window.onpageshow = function () {
+        window.yasgui = new Yasgui(document.getElementById("yasgui"), {
+          corsProxy: "",
+          requestConfig: {
+            endpoint: "~DEFAULT_SPARQL_ENDPOINT~",
+          }
+        });
+      };
+    </script>
+    <script src="/yasgui.min.js"></script>
+    <script src="/yasqe.min.js"></script>
+    <script src="/yasr.min.js"></script>
+  </body>
+</html>
diff --git a/index.html b/index.html
diff --git a/startup.sh b/startup.sh
@@ -1,12 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-if [ "$ENABLE_ENDPOINT_SELECTOR" == "true" ]; 
-then
-    sed -i '/\/\*\* endpoint-selector \*\//c\'"\/** .yasgui .endpointText {display:none !important;} *\/ \/** endpoint-selector *\/" /usr/share/nginx/html/index.html
-else
-    sed -i '/\/\*\* endpoint-selector \*\//c\'".yasgui .endpointText {display:none !important;} \/** endpoint-selector *\/" /usr/share/nginx/html/index.html
-fi
-
-sed -i '/default SPARQL endpoint/c\'"yasqe:{sparql:{endpoint:'$DEFAULT_SPARQL_ENDPOINT'}} \/\/ default SPARQL endpoint" /usr/share/nginx/html/index.html
+cd /usr/local/apache2/htdocs
+sed -i "s@~DEFAULT_SPARQL_ENDPOINT~@$DEFAULT_SPARQL_ENDPOINT@g" index.html
 
 exec "$@"
