new server changes

Author: mrfrase3

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 .env
 base-all/data/arduino/staging
-Arduino
+Arduino
+sls-config.yml
+.serverless

Dockerfile

@@ -1,10 +1,13 @@
-FROM node:10-buster
+FROM node:12-buster
 
 USER root
 RUN useradd duino
 
-COPY setup/index.js /home/duino/setup/index.js
-COPY setup/arduino-cli.yml /home/duino/data/arduino-cli.yml
+RUN mkdir -p /mnt/duino-data
+RUN chmod 0777 /mnt/duino-data
+
+COPY setup /home/duino/setup
+RUN chmod +x /home/duino/setup/*.sh
 # COPY Arduino /home/duino/Arduino
 
 # RUN mkdir /home/duino
@@ -14,39 +17,12 @@ RUN apt-get update && apt-get install build-essential -y
 WORKDIR /home/duino
 USER duino
 
-RUN wget https://github.com/arduino/arduino-cli/releases/download/0.13.0/arduino-cli_0.13.0_Linux_64bit.tar.gz -O - | tar -xz
-
-RUN ls
-
-
-ENV CLI_ARGS="--config-file /home/duino/data/arduino-cli.yml --format json"
-RUN ./arduino-cli core update-index ${CLI_ARGS}
-RUN ./arduino-cli core search "" ${CLI_ARGS} > /home/duino/data/cores.json
-
-RUN ./arduino-cli lib update-index ${CLI_ARGS}
-RUN ./arduino-cli lib search "" ${CLI_ARGS} > /home/duino/data/libs.json
-
-RUN node setup/ cores
-RUN node setup/ boards
-
-USER root
 COPY package*.json /home/duino/
-RUN chown duino:duino /home/duino/package*.json
-RUN apt-get install nano
-USER duino
-
 RUN npm ci
 
-USER root
 COPY src /home/duino/src
-RUN chown duino:duino /home/duino/src -R
-RUN mkdir /data
-RUN chmod 0777 /data
-COPY entrypoint.sh /home/duino/
-COPY load-libs.sh /home/duino/
-RUN chmod +x ./*.sh
-RUN chown duino:duino ./*.sh
-USER duino
+
+RUN node ./setup/docker-install.js
 
 EXPOSE 3030
-CMD [ "./entrypoint.sh" ]
+CMD [ "node", "src/index.js" ]

deployment/README.md

@@ -2,7 +2,7 @@
 
 Theses are some files to help make deploying on a remote server easier.
 This assumes a fresh VPS with Ubuntu 20 +, that is only going to be used as
-a compile server. A minimum of 20GB of storage is required.
+a compile server.
 
 VPS = Virtual Private Server
 

deployment/docker-compose.yml

@@ -26,7 +26,7 @@ services:
     container_name: duinoapp
     restart: unless-stopped
     volumes:
-      - duinoapp-lib-downloads:/data
+      - duinoapp-lib-downloads:/mnt/duino-data/lib-downloads
     environment: # update these, server info displayed to users
       - SERVER_INFO_NAME=Example Server
       - SERVER_INFO_LOCATION=Australia/Sydney