Docker cleanups

- Start the docker dev-env osem on port 3000. Just as our documentation says
  and how we do it in vagrant.
- hardcode CONTAINER_USERID so you don't have to have an
  docker-compose.override.yml if your UID is 1000.
- Rename web service/container to osem for clarity in the logs
- Keep assets also in a volume in production

bin/osem-init.sh

@@ -6,4 +6,4 @@ bundle check || bundle install --jobs=3 --retry=3
 # Setup the app if it isn't already setup
 bundle exec rake setup:bootstrap
 # Start the app
-foreman start
+foreman start -p 3000

docker-compose.yml.dev-example

@@ -5,13 +5,15 @@ services:
     image: postgres
     environment:
       PGDATA: /var/lib/postgresql/data/pgdata
-  web:
+  osem:
-    build: .
+    build:
-    # env_file: dotenv.example
+      context: .
+      args:
+        CONTAINER_USERID: 1000
     command: /osem/bin/osem-init.sh 
     depends_on:
       - database
     ports:
-      - 5000:5000
+      - 3000:3000
     volumes:
       - .:/osem

docker-compose.yml.production-example

@@ -7,21 +7,23 @@ services:
       PGDATA: /var/lib/postgresql/data/pgdata
     volumes:
       - database:/var/lib/postgresql/data/pgdata
-  web:
+  osem:
     build: .
     dockerfile: Dockerfile.production
     env_file: .env.production # see dotenv.example file
     depends_on:
       - database
     ports:
-      - 5000:5000
+      - 3000:3000
     volumes:
       - .:/osem
       - web-data:/osem/public/system
+      - web-assets:/osem/public/assets
       - web-logs:/osem/log
 
 # named volumes to persist data
 volumes:
   database:
   web-data:
+  web-assets:
   web-logs: