Merge pull request #682 from pjonsson/dockerfile-devserverconfig

Use new name for serverconfig.json

Dockerfile

@@ -22,7 +22,7 @@ WORKDIR /app
 # Without the chown when copying directories, wwwroot is owned by root:root.
 COPY --from=build --chown=node:node /app/wwwroot wwwroot
 COPY --from=build --chown=node:node /app/node_modules node_modules
-COPY --from=build /app/devserverconfig.json serverconfig.json
+COPY --from=build /app/serverconfig.json serverconfig.json
 COPY --from=build /app/index.js index.js
 COPY --from=build /app/package.json package.json
 COPY --from=build /app/version.js version.js

package.json

@@ -97,7 +97,7 @@
     "docker-build-local": "node deploy/docker/create-docker-context.js --build --push --tag auto --local",
     "docker-build-prod": "node deploy/docker/create-docker-context.js --build --push --tag auto --repository=ghcr.io/terriajs",
     "docker-build-ci": "node deploy/docker/create-docker-context.js --build",
-    "start": "terriajs-server --config-file devserverconfig.json",
+    "start": "terriajs-server --config-file serverconfig.json",
     "gulp": "gulp",
     "postinstall": "echo 'Installation successful. What to do next:\\n  yarn gulp dev   # Starts the server on port 3001, builds TerriaMap and dependencies, and rebuilds if files change.'",
     "hot": "webpack-dev-server --inline --config buildprocess/webpack.config.hot.js --hot --host 0.0.0.0",