postgres (2)

Author: hongaar

base/README.md

@@ -1,29 +1,32 @@
-# exivity/docker
+# exivity/base
 
-Docker base images used at Exivity.
+Multiarch Docker base image (Windows and Linux).
 
-## tags
+## Usage
 
-### :latest
+```
+docker run -it --rm exivity/base:latest
+```
 
-Multiarch image containing both Windows and Linux images.
+## Software
 
-### :windows
+### Windows
 
-_mcr.microsoft.com/windows/servercore:1903_
+Base image: _mcr.microsoft.com/windows/servercore:ltsc2019_
 
 - PowerShell 6.2.0
 - Node 10.15.3
 - Visual C++ Redistributable for Visual Studio 2015
 - Yarn 1.13.0
 - Git for Windows 2.20.1
 
-notes:
-- previously, we used _mcr.microsoft.com/windows/nanoserver:1903_ but this turned out to be incompatible with nginx, see https://social.msdn.microsoft.com/Forums/en-US/7c30cb71-d449-4910-8bf5-f56023f7218e/nginx-in-nanoserver-container
+Notes: Ideally _mcr.microsoft.com/windows/nanoserver:1903_ would be used for a 
+smaller footprint, but nginx for Windows is only available as a 32bit version
+(see https://social.msdn.microsoft.com/Forums/en-US/7c30cb71-d449-4910-8bf5-f56023f7218e/nginx-in-nanoserver-container)
 
-### :linux
+### Linux
 
-_ubuntu:latest_
+Base image: _ubuntu:latest_
 
 - zip
 - unzip

rabbitmq/README.md

@@ -1,29 +1,31 @@
 # exivity:rabbitmq
 
-Builds Docker images of Rabbit MQ server (Windows only).
+Docker image of Rabbit MQ server (Windows only).
 
-## Commands during development
+## Usage
 
 ```
-export $RABBITMQ_VERSION=3.8.6
+docker run --rm --detach \
+  -p 4369:4369 -p 5671:5671 -p 5672:5672 -p 15672:15672 \
+  --name rabbitmq exivity/rabbitmq:latest
 ```
 
-Build:
+## Development
 
 ```
-docker build --build-arg VERSION=$RABBITMQ_VERSION --file Dockerfile.windows --tag exivity/rabbitmq:$RABBITMQ_VERSION .
+export RABBITMQ_VERSION=3.8.6
 ```
 
-Run interactively:
+Build:
 
 ```
-docker run --rm -it -p 4369:4369 -p 5671:5671 -p 5672:5672 -p 15672:15672 --name rabbitmq exivity/rabbitmq:$RABBITMQ_VERSION
+docker build --build-arg VERSION=$RABBITMQ_VERSION --file Dockerfile.windows --tag exivity/rabbitmq:$RABBITMQ_VERSION .
 ```
 
-Run in background:
+Run interactively:
 
 ```
-docker run --rm --detach -p 4369:4369 -p 5671:5671 -p 5672:5672 -p 15672:15672 --name rabbitmq exivity/rabbitmq:$RABBITMQ_VERSION
+docker run --rm -it -p 4369:4369 -p 5671:5671 -p 5672:5672 -p 15672:15672 --name rabbitmq exivity/rabbitmq:$RABBITMQ_VERSION
 ```
 
 Attach shell to running container:
@@ -32,7 +34,7 @@ Attach shell to running container:
 docker exec -it rabbitmq cmd.exe
 ```
 
-Then, i.e. follow log file:
+Follow log file:
 
 ```
 powershell