Merge pull request #42 from scline/1.1.38

Update cacti from 1.1.37 to 1.1.38. Update docker file RUN commands
scline · Jun 12, 2018 · ce1ba1a · ce1ba1a
2 parents 9ce6421 + e803f40
commit ce1ba1a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,13 +11,10 @@ RUN \
     yum install -y \
         rrdtool net-snmp net-snmp-utils cronie php-ldap php-devel mysql php \
         ntp bison php-cli php-mysql php-common php-mbstring php-snmp curl \
-        php-gd openssl openldap mod_ssl php-pear net-snmp-libs php-pdo
-
-## --- SPINE ---
-RUN \
-    yum install -y \ 
+        php-gd openssl openldap mod_ssl php-pear net-snmp-libs php-pdo \
         autoconf automake gcc gzip help2man libtool make net-snmp-devel \
-        m4 libmysqlclient-devel libmysqlclient openssl-devel dos2unix wget mariadb-devel \
+        m4 libmysqlclient-devel libmysqlclient openssl-devel dos2unix wget mariadb-devel && \
+
 ## --- CLEANUP ---
     yum clean all
 

diff --git a/README.md b/README.md
@@ -184,7 +184,12 @@ REPLACE INTO `%DB_NAME%`.`settings` (`name`, `value`) VALUES('poller_type', '2')
 ```
 
 # Change Log
-#### 1.1.37 - 02/8/2018
+#### 1.1.38 - 05/12/2018
+ * Update Cacti and Spine from 1.1.37 to 1.1.38
+   * [changelog 1.1.37 -> 1.1.38][CL1.1.38]
+ * Merge yum run commands in dockerfile to reduce stored space.
+
+#### 1.1.37 - 04/4/2018
  * Update Cacti and Spine from 1.1.34 to 1.1.37
    * [changelog 1.1.36 -> 1.1.37][CL1.1.37]
    * [changelog 1.1.35 -> 1.1.36][CL1.1.36]
@@ -302,6 +307,7 @@ REPLACE INTO `%DB_NAME%`.`settings` (`name`, `value`) VALUES('poller_type', '2')
 * Auto import remote pollers, currently you need to navigate to there GUI for a few clicks.
 * Documentation cleanup.
 
+[CL1.1.38]: http://www.cacti.net/release_notes.php?version=1.1.38
 [CL1.1.37]: http://www.cacti.net/release_notes.php?version=1.1.37
 [CL1.1.36]: http://www.cacti.net/release_notes.php?version=1.1.36
 [CL1.1.35]: http://www.cacti.net/release_notes.php?version=1.1.35

diff --git a/cacti/cacti-1.1.37.tar.gz → cacti/cacti-1.1.38.tar.gz b/cacti/cacti-1.1.37.tar.gz → cacti/cacti-1.1.38.tar.gz
diff --git a/cacti/cacti-spine-1.1.37.tar.gz b/cacti/cacti-spine-1.1.37.tar.gz
diff --git a/cacti/cacti-spine-1.1.38.tar.gz b/cacti/cacti-spine-1.1.38.tar.gz