Auto merge of #3053 - nilslice:sm/docker-run-fix, r=jtgeibel

dev: update docker node version, server address, and docker-compose

Fixes dockerized environment to run crates.io locally.

Author: bors

docker-compose.yml

@@ -1,4 +1,5 @@
 version: "3"
+
 services:
   postgres:
     image: postgres:9.6
@@ -10,16 +11,19 @@ services:
       - 5432:5432
     volumes:
       - postgres-data:/var/lib/postgresql/data
+
   backend:
     build:
       context: .
       dockerfile: backend.Dockerfile
     environment:
+      DEV_DOCKER: "true"
       DATABASE_URL: postgres://postgres:password@postgres/cargo_registry
       SESSION_KEY: badkeyabcdefghijklmnopqrstuvwxyzabcdef
       GIT_REPO_URL: file://./tmp/index-bare
       GH_CLIENT_ID: ""
       GH_CLIENT_SECRET: ""
+      WEB_ALLOWED_ORIGINS: http://localhost:8888,http://localhost:4200
     links:
       - postgres
     ports:
@@ -32,6 +36,7 @@ services:
       - index:/app/tmp
       - cargo-cache:/usr/local/cargo/registry
       - target-cache:/app/target
+
   frontend:
     build:
       context: .

docs/CONTRIBUTING.md

@@ -528,6 +528,9 @@ services:
       GH_CLIENT_SECRET: blahblah_secret
 ```
 
+These environment variables can also be defined in a local `.env` file, see `.env.sample`
+for various configuration options. 
+
 #### Accessing services
 
 By default, the services will be exposed on their normal ports:

frontend.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.9-alpine
+FROM node:14.9-alpine
 
 WORKDIR /app
 COPY package.json yarn.lock /app/

src/bin/server.rs

@@ -60,7 +60,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let heroku = dotenv::var("HEROKU").is_ok();
     let fastboot = dotenv::var("USE_FASTBOOT").is_ok();
+    let dev_docker = dotenv::var("DEV_DOCKER").is_ok();
 
+    let ip = if dev_docker {
+        [0, 0, 0, 0]
+    } else {
+        [127, 0, 0, 1]
+    };
     let port = if heroku {
         8888
     } else {
@@ -103,7 +109,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 async move { Service::from_blocking(handler, addr) }
             });
 
-        let addr = ([127, 0, 0, 1], port).into();
+        let addr = (ip, port).into();
         #[allow(clippy::async_yields_async)]
         let server = rt.block_on(async { hyper::Server::bind(&addr).serve(make_service) });