A couple of build fixes

These changes reflect the more complex build process we get by commit
39e10a3.

Author: MKleusberg

build_dbhub.sh

@@ -39,11 +39,9 @@ if [ ! -e "${DEST}/lib/libsqlite3.so" ]; then
 fi
 
 # Compile JSX files and build webpack bundle
-npm install
-cd webui
-yarn run babel jsx --out-dir js --presets babel-preset-react-app/prod
-yarn run webpack
-cd ..
+yarn
+yarn run babel webui/jsx --out-dir webui/js --presets babel-preset-react-app/prod
+yarn run webpack -c webui/webpack.config.js
 
 # Builds the Go binaries
 if [ -d "${GOBIN}" ]; then

docker/Dockerfile

@@ -7,7 +7,7 @@ LABEL maintainer="Justin Clift <[email protected]>"
 RUN  \
     apk update && \
     apk upgrade && \
-    apk add --no-cache ca-certificates 'curl>7.61.0' git go libc-dev memcached postgresql sqlite-dev
+    apk add --no-cache ca-certificates 'curl>7.61.0' git go libc-dev memcached postgresql sqlite-dev yarn
 
 # Create the DBHub.io OS user
 RUN addgroup dbhub && \
@@ -104,7 +104,11 @@ RUN echo "echo 127.0.0.1 docker-dev.dbhub.io docker-dev >> /etc/hosts" >> /usr/l
     echo "done" >> /usr/local/bin/start.sh
 
 # Create script to compile DBHub.io daemons
-RUN echo "cd ${DBHUB_SOURCE}/api" >> /usr/local/bin/compile.sh && \
+RUN echo "cd ${DBHUB_SOURCE}" >> /usr/local/bin/compile.sh && \
+    echo "yarn" >> /usr/local/bin/compile.sh && \
+    echo "yarn run babel ${DBHUB_SOURCE}/webui/jsx --out-dir ${DBHUB_SOURCE}/webui/js --presets babel-preset-react-app/prod" >> /usr/local/bin/compile.sh && \
+    echo "yarn run webpack -c ${DBHUB_SOURCE}/webui/webpack.config.js" >> /usr/local/bin/compile.sh && \
+    echo "cd ${DBHUB_SOURCE}/api" >> /usr/local/bin/compile.sh && \
     echo "go build -gcflags \"all=-N -l\" -buildvcs=false -o /usr/local/bin/dbhub-api ." >> /usr/local/bin/compile.sh && \
     echo "cd ${DBHUB_SOURCE}/db4s" >> /usr/local/bin/compile.sh && \
     echo "go build -gcflags \"all=-N -l\" -buildvcs=false -o /usr/local/bin/dbhub-db4s ." >> /usr/local/bin/compile.sh && \
@@ -155,7 +159,6 @@ RUN echo "# Kill the existing running daemons" >> /usr/local/bin/debug.sh && \
 
 # Build the DBHub.io daemons
 RUN cd / && git clone --branch master --depth 5 https://github.com/sqlitebrowser/dbhub.io
-VOLUME ${DBHUB_SOURCE}
 RUN /usr/local/bin/compile.sh
 
 # Initialise PostgreSQL and Minio

package.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "@babel/cli": "^7.20.7",
     "babel-preset-react": "^6.24.1",
     "babel-preset-react-app": "^10.0.1",
     "cypress": "^12.3.0",
@@ -41,6 +40,7 @@
   "license": "AGPL-3.0-or-later",
   "private": false,
   "devDependencies": {
+    "@babel/cli": "^7.20.7",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   }

webui/webpack.config.js

@@ -2,9 +2,9 @@ const path = require("path");
 
 module.exports = {
 	mode: "production",		// Change to "development" for debugging purposes
-	entry: "./js/app.js",
+	entry: "./webui/js/app.js",
 	output: {
 		filename: "dbhub.js",
-		path: path.resolve(__dirname, "js")
+		path: path.resolve(__dirname, "webui/js")
 	}
 };