Merge branch 'main' into tryMoveAuth

Author: timea-solid

Dockerfile

@@ -4,6 +4,7 @@ FROM node:lts
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 COPY package.json /usr/src/app/
+COPY package-lock.json /usr/src/app/
 RUN npm install
 COPY . /usr/src/app
 

README.md

@@ -237,19 +237,25 @@ We have automatic builds set up, so commits to master will trigger a build of ht
 
 ### Development usage
 
-If you want to use Docker in development, then you can build it locally with:
+If you want to use Docker in development, you can build and run the image locally with either docker-compose —
 
 ```bash
 git clone https://github.com/solid/node-solid-server
 cd node-solid-server
-docker build -t node-solid-server .
+docker-compose up -d
 ```
 
-Run with:
+ — or these manual commands —
+
 ```bash
+git clone https://github.com/solid/node-solid-server
+cd node-solid-server
+docker build -t node-solid-server .
+
 docker run -p 8443:8443 --name solid node-solid-server
 ```
 
+
 This will enable you to login to solid on https://localhost:8443 and then create a new account
 but not yet use that account. After a new account is made you will need to create an entry for 
 it in your local (/etc/)hosts file in line with the account and subdomain, i.e. --

docker-compose.yml

@@ -0,0 +1,10 @@
+version: "3"
+services:
+  solid-server:
+    build: .
+    container_name: solid
+    ports:
+      - "8443:8443"
+    entrypoint: npm run solid start -- --no-reject-unauthorized
+    environment:
+      - NODE_TLS_REJECT_UNAUTHORIZED=0