fix commit for readme

README.md

@@ -0,0 +1,43 @@
+# eduroam-freeradius
+
+<<<<<<< HEAD
+### How to deploy the eduroam FreeRadius docker container on a docker-enabled host:
+
+## Run the container directly:
+    docker run -d -p 443:443 -p 1812:1812/udp -p 1813:1813/udp tier/eduroam-freeradius:3.0-20200221
+
+## Below are settings for thhe container and their default values, wihchh can be overridden at run-time:
+    DB_LOCATION=local
+    DB_DRIVER=rlm_sql_mysql
+    DB_DIALECT=mysql
+    DB_HOST=localhost
+    DB_PORT=3306
+    DB_ROOT_PWD=SuperStrongPassword
+    DB_USER=radius
+    DB_USER_PWD=SuperStrongPassword
+    DB_NAME=radius
+    ENV=dev
+    USERTOKEN=nothing
+
+## The Daloradius UI should now be accessible on port 443 (https) of the host (with a self-signed cert). Default creds are:
+    username: administrator
+    password: radius
+=======
+### Commands for running container:
+
+docker run -d -p 443:443 -p 1812:1812/udp -p 1813:1813/udp tier/eduroam-freeradius:3.0-20200221
+
+The following environment variables can be overridden:
+
+ENV DB_LOCATION=local \
+    DB_DRIVER=rlm_sql_mysql \
+    DB_DIALECT=mysql \
+    DB_HOST=localhost \
+    DB_PORT=3306 \
+    DB_ROOT_PWD=SuperStrongPassword \
+    DB_USER=radius \
+    DB_USER_PWD=SuperStrongPassword \
+    DB_NAME=radius \
+    ENV=dev \
+    USERTOKEN=nothing
+>>>>>>> 704df2c8edbfc851528f2856357e7e7dbda35586