Update Version, Fix MySQL container, Update Format of Markdown Files,…

… Change Postgres Version - 13 (#56)

* Several updates.

* Fix tests.

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 ---
 name: "CI"
-on:
+on:  # yamllint disable
   - "push"
   - "pull_request"
 jobs:

Dockerfile-LDAP

@@ -1,5 +1,7 @@
 ARG PYTHON_VER=3.9
+
 ARG NAUTOBOT_VERSION=1.5.9
+
 FROM networktocode/nautobot:${NAUTOBOT_VERSION}-py${PYTHON_VER} as base
 
 USER 0

README.md

@@ -6,6 +6,7 @@ Network to Code has an existing published Nautobot Docker Image on Docker Hub. S
 
 By default, this project deploys the Nautobot application, a single worker container, Redis containers, and PostgresQL. It does not deploy NGINX, SSL, or any Nautobot plugins. However, the project is extensible to allow users to tailor to their specific requirements. For example, if you need to deploy [SSL](docs/create_ssl_cert.md) or [plugins](docs/plugins.md), see the docs linked. The web server used on the application is [pyuwsgi](https://uwsgi-docs.readthedocs.io/en/latest/).
 
+
 ## Environment Variable Controls
 
 There are two variables that should be set for the Docker-Compose file. The following table covers the environment variables, default setting, and what it does.
@@ -25,7 +26,7 @@ This documentation is now written assuming the latest Docker Compose methodology
 If you want to use MySQL for the database instead of postgres, In step 7 below instead use
 
 ```
-docker-compose -f docker-compose.yml -f docker-compose.mysql.yml up
+docker compose -f docker-compose.yml -f docker-compose.mysql.yml up
 ```
 
 ## Docker Compose

docker-compose.mysql.yml

@@ -2,11 +2,13 @@
 version: "3.7"
 services:
   db:
-    image: "mariadb"
+    image: "mysql"
     env_file:
       - "local.env"
     environment:
       NAUTOBOT_DB_ENGINE: "django.db.backends.mysql"
     volumes:
       - "db_data:/var/lib/mysql"
     restart: "unless-stopped"
+volumes:
+  db_data:

docker-compose.yml

@@ -2,7 +2,7 @@
 version: "3.7"
 services:
   nautobot:
-    image: "networktocode/nautobot:${NAUTOBOT_IMAGE:-1.5.9}-py${PYTHON_VER:-3.9}"
+    image: "networktocode/nautobot:${NAUTOBOT_IMAGE:-1.5.11}-py${PYTHON_VER:-3.9}"
     env_file:
       - "local.env"
     ports:
@@ -13,7 +13,7 @@ services:
   # Celery worker must only be used in > 1.1.0 installs. If setting to a previous install, remove this worker
   # ----------------------------------
   celery_worker:
-    image: "networktocode/nautobot:${NAUTOBOT_IMAGE:-1.5.9}-py${PYTHON_VER:-3.9}"
+    image: "networktocode/nautobot:${NAUTOBOT_IMAGE:-1.5.11}-py${PYTHON_VER:-3.9}"
     entrypoint: "sh -c 'nautobot-server celery worker -l $$NAUTOBOT_LOG_LEVEL'"
     healthcheck:
       interval: "5s"
@@ -31,7 +31,7 @@ services:
   # Celery beat must only be used in > 1.2.0 installs. If setting to a previous install, remove this worker
   # ----------------------------------
   celery_beat:
-    image: "networktocode/nautobot:${NAUTOBOT_IMAGE:-1.5.9}-py${PYTHON_VER:-3.9}"
+    image: "networktocode/nautobot:${NAUTOBOT_IMAGE:-1.5.11}-py${PYTHON_VER:-3.9}"
     entrypoint: "sh -c 'nautobot-server celery beat -l $$NAUTOBOT_LOG_LEVEL'"
     healthcheck:
       interval: "5s"

local.env.example

@@ -33,10 +33,10 @@ POSTGRES_PASSWORD=decinablesprewad
 POSTGRES_USER=nautobot
 
 # Needed for MariaDB, should match the values for Nautobot above
-MARIADB_USER=nautobot
-MARIADB_PASSWORD=decinablesprewad
-MARIADB_DATABASE=nautobot
-MARIADB_ROOT_PASSWORD=decinablesprewad
+MYSQL_USER=nautobot
+MYSQL_PASSWORD=decinablesprewad
+MYSQL_DATABASE=nautobot
+MYSQL_ROOT_PASSWORD=decinablesprewad
 
 NAUTOBOT_HIDE_RESTRICTED_UI=True
 NAUTOBOT_LOG_LEVEL=WARNING

plugin_example/Dockerfile-Plugins

@@ -1,4 +1,5 @@
 ARG PYTHON_VER
+
 ARG NAUTOBOT_VERSION=1.5.9
 FROM networktocode/nautobot:${NAUTOBOT_VERSION}-py${PYTHON_VER}