From 4b14d370b42d9a097b4618cdaeeeeb951a4a7c9b Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Thu, 7 Nov 2019 10:40:19 -0600
Subject: [PATCH] Minor changes

---
 .gitignore                    |  1 -
 docker-compose.yml            |  6 ++----
 docker_configs/api.Dockerfile | 15 +++++++--------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f3cf2845..e69ea1ddc 100755
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ api_docs.md
 erd_diagram.png
 erd.pdf
 *scratchpad*
-scratchpad.rb
 /config/master.key
 config/credentials.yml.enc
 # ActiveStorage blobs:
diff --git a/docker-compose.yml b/docker-compose.yml
index 866666e50..8028f4d77 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@
 #             +--------+ +------------+
 # ================================================
 
-version: '3.4'
+version: "3"
 services:
   redis:
     env_file: ".env"
@@ -57,9 +57,7 @@ services:
 
   mqtt:
     env_file: ".env"
-    build:
-      context: "./docker_configs"
-      dockerfile: rabbitmq.Dockerfile
+    image: rickcarlino/experimental-docker-rmq:latest
     ports: ["5672:5672", "1883:1883", "8883:8883", "3002:15675", "15672:15672"]
     depends_on: ["web"]
     environment: ["RABBITMQ_CONFIG_FILE=/farmbot/farmbot_rmq_config"]
diff --git a/docker_configs/api.Dockerfile b/docker_configs/api.Dockerfile
index abc17d481..067bb8c10 100644
--- a/docker_configs/api.Dockerfile
+++ b/docker_configs/api.Dockerfile
@@ -1,12 +1,11 @@
 FROM ruby:2.6.5
-RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add -
-RUN sh -c 'VERSION_CODENAME=stretch; . /etc/os-release; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev \
-  postgresql postgresql-contrib
-RUN     curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN sh -c 'echo "\nPackage: *\nPin: origin deb.nodesource.com\nPin-Priority: 700\n" >> /etc/apt/preferences'
-RUN     apt-get install -y nodejs
-RUN     mkdir /farmbot
+RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
+  sh -c 'VERSION_CODENAME=stretch; . /etc/os-release; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
+  apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql postgresql-contrib && \
+  curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
+  sh -c 'echo "\nPackage: *\nPin: origin deb.nodesource.com\nPin-Priority: 700\n" >> /etc/apt/preferences' && \
+  apt-get install -y nodejs && \
+  mkdir /farmbot;
 WORKDIR /farmbot
 ENV     BUNDLE_PATH=/bundle BUNDLE_BIN=/bundle/bin GEM_HOME=/bundle
 ENV     PATH="${BUNDLE_BIN}:${PATH}"