Merge pull request #3 from portefaix/develop

Release 1.0.0
ploio · Mar 26, 2016 · 390a56c · 390a56c
2 parents bbd81dc + dea6de3
commit 390a56c
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 132 deletions.
diff --git a/0.10/Dockerfile b/0.10/Dockerfile
@@ -1,39 +1,38 @@
-# VERSION 0.10.0
+# VERSION 0.10.3.1
 # AUTHOR:         Nicolas Lamirault <[email protected]>
 # DESCRIPTION:    portefaix/influxdb
 
 FROM portefaix/base:3.3
 MAINTAINER Nicolas Lamirault <[email protected]>
 
-ENV INFLUXDB_VERSION 0.10.3
-ENV GOPATH /go
+ENV INFLUXDB_VERSION=0.10.3-1
+ENV GLIBC_VERSION=2.23-r1
+ENV INFLUXDB_FILE=influxdb-${INFLUXDB_VERSION}_linux_amd64
+ENV GLIBC_FILE=glibc-${GLIBC_VERSION}.apk
 
-ENV PRE_CREATE_DB **None**
-ENV SSL_SUPPORT **False**
-ENV SSL_CERT **None**
+WORKDIR /tmp
 
-RUN apk add --update build-base curl go git mercurial ca-certificates
+RUN addgroup -S influxdb && adduser -S -G influxdb influxdb \
+    && apk add --update curl openssl \
+    && curl -Ls https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${GLIBC_FILE} > /tmp/${GLIBC_FILE} \
+    && apk add --allow-untrusted /tmp/${GLIBC_FILE} \
+    && curl -Ls https://influxdb.s3.amazonaws.com/$INFLUXDB_FILE.tar.gz > /tmp/$INFLUXDB_FILE.tar.gz \
+    && tar xvfz $INFLUXDB_FILE.tar.gz \
+    && rm /tmp/$INFLUXDB_FILE.tar.gz \
+    && cp /tmp/influxdb-$INFLUXDB_VERSION/usr/bin/* /usr/bin \
+    && cp -r /tmp/influxdb-$INFLUXDB_VERSION/etc/influxdb /etc \
+    && echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf \
+    && mkdir /var/lib/influxdb/ \
+    && chown influxdb.influxdb /var/lib/influxdb/ \
+    && apk del curl \
+    && rm -rf /tmp/* /var/cache/apk/*
 
-RUN mkdir -p ${GOPATH}/src/github.com/influxdata && cd ${GOPATH}/src/github.com/influxdata && \
-    git clone https://github.com/influxdata/influxdb.git && \
-    go get -u -f -t ./... && \
-    go build -ldflags="-X main.version=v${INFLUXDB_VERSION} -X main.branch=master -X main.commit=`cd influxdb && git rev-parse HEAD`" ./... && \
-    go install ./... && \
-    cp $GOPATH/bin/* /usr/local/bin && \
-    go clean -i -r && \
-    apk del --purge build-base go git mercurial && \
-    rm -rf ${GOPATH} /tmp/* /var/cache/apk/* /root/.n*
+ADD config.toml /etc/influxdb.toml
 
-ADD ./config.toml /usr/share/influxdb/config.toml
-# ADD ./influxdb.sh /usr/share/influxdb/influxdb.sh
+USER influxdb
 
-VOLUME ["/data"]
+WORKDIR /var/lib/influxdb
 
-EXPOSE 8083
-EXPOSE 8086
-# Raft port (for clustering, don't expose)
-# EXPOSE 8090
-# Protobuf port (flor clustering, don't expose)
-# EXPOSE 8099
+EXPOSE 8088 8091 8083 8086
 
-CMD ["/usr/local/bin/influxd", "-config", "/usr/share/influxdb/config.toml"]
+CMD ["/usr/bin/influxd", "-config", "/etc/influxdb.toml"]
diff --git a/0.10/config.toml b/0.10/config.toml
@@ -27,32 +27,13 @@ reporting-disabled = false
   # Where the metadata/raft database is stored
   dir = "/var/lib/influxdb/meta"
 
-  # The default address to bind to
   bind-address = ":8088"
-
-  # The default address to bind the API to
-  http-bind-address = ":8091"
-  https-enabled = false
-  https-certificate = ""
-
   retention-autocreate = true
-  # The default election timeout for the store
   election-timeout = "1s"
-  # The default heartbeat timeout for the store
   heartbeat-timeout = "1s"
-  # The default leader lease for the store
   leader-lease-timeout = "500ms"
-  # The default commit timeout for the store
   commit-timeout = "50ms"
-  # If trace log messages are printed for the meta service
   cluster-tracing = false
-  # The default for auto promoting a node to a raft node when needed
-  raft-promotion-enabled = true
-  # If log messages are printed for the meta service
-  logging-enabled = true
-  pprof-enabled = false
-  # The default duration for leases.
-  lease-duration = "1m0s"
 
 ###
 ### [data]
@@ -69,11 +50,37 @@ reporting-disabled = false
 
   dir = "/var/lib/influxdb/data"
 
+  # The following WAL settings are for the b1 storage engine used in 0.9.2. They won't
+  # apply to any new shards created after upgrading to a version > 0.9.3.
+  max-wal-size = 104857600 # Maximum size the WAL can reach before a flush. Defaults to 100MB.
+  wal-flush-interval = "10m" # Maximum time data can sit in WAL before a flush.
+  wal-partition-flush-delay = "2s" # The delay time between each WAL partition being flushed.
+
   # These are the WAL settings for the storage engine >= 0.9.3
   wal-dir = "/var/lib/influxdb/wal"
   wal-logging-enabled = true
   data-logging-enabled = true
 
+  # When a series in the WAL in-memory cache reaches this size in bytes it is marked as ready to
+  # flush to the index
+  # wal-ready-series-size = 25600
+
+  # Flush and compact a partition once this ratio of series are over the ready size
+  # wal-compaction-threshold = 0.6
+
+  # Force a flush and compaction if any series in a partition gets above this size in bytes
+  # wal-max-series-size = 2097152
+
+  # Force a flush of all series and full compaction if there have been no writes in this
+  # amount of time. This is useful for ensuring that shards that are cold for writes don't
+  # keep a bunch of data cached in memory and in the WAL.
+  # wal-flush-cold-interval = "10m"
+
+  # Force a partition to flush its largest series if it reaches this approximate size in
+  # bytes. Remember there are 5 partitions so you'll need at least 5x this amount of memory.
+  # The more memory you have, the bigger this can be.
+  # wal-partition-size-threshold = 20971520
+
   # Whether queries should be logged before execution. Very useful for troubleshooting, but will
   # log any sensitive data contained within a query.
   # query-log-enabled = true
@@ -225,32 +232,36 @@ reporting-disabled = false
   # bind-address = ":2003"
   # protocol = "tcp"
   # consistency-level = "one"
+  # name-separator = "."
 
   # These next lines control how batching works. You should have this enabled
   # otherwise you could get dropped metrics or poor performance. Batching
   # will buffer points in memory if you have many coming in.
 
-  # batch-size = 5000 # will flush if this many points get buffered
-  # batch-pending = 10 # number of batches that may be pending in memory
+  # batch-size = 1000 # will flush if this many points get buffered
+  # batch-pending = 5 # number of batches that may be pending in memory
   # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit
   # udp-read-buffer = 0 # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
 
-  ### This string joins multiple matching 'measurement' values providing more control over the final measurement name.
-  # separator = "."
-
-  ### Default tags that will be added to all metrics.  These can be overridden at the template level
-  ### or by tags extracted from metric
-  # tags = ["region=us-east", "zone=1c"]
-
-  ### Each template line requires a template pattern.  It can have an optional
-  ### filter before the template and separated by spaces.  It can also have optional extra
-  ### tags following the template.  Multiple tags should be separated by commas and no spaces
-  ### similar to the line protocol format.  There can be only one default template.
-  # templates = [
-  #   "*.app env.service.resource.measurement",
-  #   # Default template
-  #   "server.*",
-  # ]
+  ## "name-schema" configures tag names for parsing the metric name from graphite protocol;
+  ## separated by `name-separator`.
+  ## The "measurement" tag is special and the corresponding field will become
+  ## the name of the metric.
+  ## e.g. "type.host.measurement.device" will parse "server.localhost.cpu.cpu0" as
+  ## {
+  ##     measurement: "cpu",
+  ##     tags: {
+  ##         "type": "server",
+  ##         "host": "localhost,
+  ##         "device": "cpu0"
+  ##     }
+  ## }
+  # name-schema = "type.host.measurement.device"
+
+  ## If set to true, when the input metric name has more fields than `name-schema` specified,
+  ## the extra fields will be ignored.
+  ## Otherwise an error will be logged and the metric rejected.
+  # ignore-unnamed = true
 
 ###
 ### [collectd]

diff --git a/0.10/influxdb.sh b/0.10/influxdb.sh
diff --git a/0.11/Dockerfile b/0.11/Dockerfile
@@ -1,39 +1,38 @@
-# VERSION 0.11.0
+# VERSION 0.11.0.1
 # AUTHOR:         Nicolas Lamirault <[email protected]>
 # DESCRIPTION:    portefaix/influxdb
 
 FROM portefaix/base:3.3
 MAINTAINER Nicolas Lamirault <[email protected]>
 
-ENV INFLUXDB_VERSION 0.11.0
-ENV GOPATH /go
+ENV INFLUXDB_VERSION=0.11.0-1
+ENV GLIBC_VERSION=2.23-r1
+ENV INFLUXDB_FILE=influxdb-${INFLUXDB_VERSION}_linux_amd64
+ENV GLIBC_FILE=glibc-${GLIBC_VERSION}.apk
 
-ENV PRE_CREATE_DB **None**
-ENV SSL_SUPPORT **False**
-ENV SSL_CERT **None**
+WORKDIR /tmp
 
-RUN apk add --update build-base curl go git mercurial ca-certificates
+RUN addgroup -S influxdb && adduser -S -G influxdb influxdb \
+    && apk add --update curl openssl \
+    && curl -Ls https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${GLIBC_FILE} > /tmp/${GLIBC_FILE} \
+    && apk add --allow-untrusted /tmp/${GLIBC_FILE} \
+    && curl -Ls https://influxdb.s3.amazonaws.com/$INFLUXDB_FILE.tar.gz > /tmp/$INFLUXDB_FILE.tar.gz \
+    && tar xvfz $INFLUXDB_FILE.tar.gz \
+    && rm /tmp/$INFLUXDB_FILE.tar.gz \
+    && cp /tmp/influxdb-$INFLUXDB_VERSION/usr/bin/* /usr/bin \
+    && cp -r /tmp/influxdb-$INFLUXDB_VERSION/etc/influxdb /etc \
+    && echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf \
+    && mkdir /var/lib/influxdb/ \
+    && chown influxdb.influxdb /var/lib/influxdb/ \
+    && apk del curl \
+    && rm -rf /tmp/* /var/cache/apk/*
 
-RUN mkdir -p ${GOPATH}/src/github.com/influxdata && cd ${GOPATH}/src/github.com/influxdata && \
-    git clone https://github.com/influxdata/influxdb.git && \
-    go get -u -f -t ./... && \
-    go build -ldflags="-X main.version=v${INFLUXDB_VERSION} -X main.branch=master -X main.commit=`cd influxdb && git rev-parse HEAD`" ./... && \
-    go install ./... && \
-    cp $GOPATH/bin/* /usr/local/bin && \
-    go clean -i -r && \
-    apk del --purge build-base go git mercurial && \
-    rm -rf ${GOPATH} /tmp/* /var/cache/apk/* /root/.n*
+ADD config.toml /etc/influxdb.toml
 
-ADD ./config.toml /usr/share/influxdb/config.toml
-# ADD ./influxdb.sh /usr/share/influxdb/influxdb.sh
+USER influxdb
 
-VOLUME ["/data"]
+WORKDIR /var/lib/influxdb
 
-EXPOSE 8083
-EXPOSE 8086
-# Raft port (for clustering, don't expose)
-# EXPOSE 8090
-# Protobuf port (flor clustering, don't expose)
-# EXPOSE 8099
+EXPOSE 8088 8091 8083 8086
 
-CMD ["/usr/local/bin/influxd", "-config", "/usr/share/influxdb/config.toml"]
+CMD ["/usr/bin/influxd", "-config", "/etc/influxdb.toml"]
diff --git a/0.11/influxdb.sh b/0.11/influxdb.sh
diff --git a/0.9/Dockerfile b/0.9/Dockerfile
@@ -1,39 +1,38 @@
-# VERSION 0.9.6
+# VERSION 0.9.6.1
 # AUTHOR:         Nicolas Lamirault <[email protected]>
 # DESCRIPTION:    portefaix/influxdb
 
-FROM portefaix/base:3.2
+FROM portefaix/base:3.3
 MAINTAINER Nicolas Lamirault <[email protected]>
 
-ENV INFLUXDB_VERSION 0.9.6
-ENV GOPATH /go
+ENV INFLUXDB_VERSION=0.9.6.1
+ENV GLIBC_VERSION=2.23-r1
+ENV INFLUXDB_FILE=influxdb_${INFLUXDB_VERSION}_x86_64
+ENV GLIBC_FILE=glibc-${GLIBC_VERSION}.apk
 
-ENV PRE_CREATE_DB **None**
-ENV SSL_SUPPORT **False**
-ENV SSL_CERT **None**
+WORKDIR /tmp
 
-RUN apk add --update build-base curl go git mercurial ca-certificates
+RUN addgroup -S influxdb && adduser -S -G influxdb influxdb \
+    && apk add --update curl openssl \
+    && curl -Ls https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${GLIBC_FILE} > /tmp/${GLIBC_FILE} \
+    && apk add --allow-untrusted /tmp/${GLIBC_FILE} \
+    && curl -Ls https://influxdb.s3.amazonaws.com/$INFLUXDB_FILE.tar.gz > /tmp/$INFLUXDB_FILE.tar.gz \
+    && tar xvfz $INFLUXDB_FILE.tar.gz \
+    && rm /tmp/$INFLUXDB_FILE.tar.gz \
+    && cp /tmp/influxdb_${INFLUXDB_VERSION}_x86_64/usr/bin/* /usr/bin \
+    && cp -r /tmp/influxdb_${INFLUXDB_VERSION}_x86_64/etc/influxdb /etc \
+    && echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf \
+    && mkdir /var/lib/influxdb/ \
+    && chown influxdb.influxdb /var/lib/influxdb/ \
+    && apk del curl \
+    && rm -rf /tmp/* /var/cache/apk/*
 
-RUN mkdir -p ${GOPATH}/src/github.com/influxdata && cd ${GOPATH}/src/github.com/influxdata && \
-    git clone https://github.com/influxdata/influxdb.git && \
-    go get -u -f -t ./... && \
-    go build -ldflags="-X main.version=v${INFLUXDB_VERSION} -X main.branch=master -X main.commit=`cd influxdb && git rev-parse HEAD`" ./... && \
-    go install ./... && \
-    cp $GOPATH/bin/* /usr/local/bin && \
-    go clean -i -r && \
-    apk del --purge build-base go git mercurial && \
-    rm -rf ${GOPATH} /tmp/* /var/cache/apk/* /root/.n*
+ADD config.toml /etc/influxdb.toml
 
-ADD ./config.toml /usr/share/influxdb/config.toml
-# ADD ./influxdb.sh /usr/share/influxdb/influxdb.sh
+USER influxdb
 
-VOLUME ["/data"]
+WORKDIR /var/lib/influxdb
 
-EXPOSE 8083
-EXPOSE 8086
-# Raft port (for clustering, don't expose)
-# EXPOSE 8090
-# Protobuf port (flor clustering, don't expose)
-# EXPOSE 8099
+EXPOSE 8088 8091 8083 8086
 
-CMD ["/usr/local/bin/influxd", "-config", "/usr/share/influxdb/config.toml"]
+CMD ["/usr/bin/influxd", "-config", "/etc/influxdb.toml"]
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,10 @@
 ChangeLog
 ==============
 
+# Version 1.0.0 (03/26/2016)
+
+- Use the binaries from InfluxData
+
 # Version 0.3.0 (03/24/2016)
 
 - Add InfluxDB 0.11.0

diff --git a/Makefile b/Makefile
@@ -43,7 +43,12 @@ build:
 .PHONY: run
 run:
 	@echo -e "$(OK_COLOR)[$(APP)] run $(NAMESPACE)/$(IMAGE):$(VERSION)$(NO_COLOR)"
-	@$(DOCKER) run --rm=true -p 8083:8083 -p 8086:8086 -p 8090:8090 -p 8099:8099 --name $(NAMESPACE)_$(IMAGE) $(NAMESPACE)/$(IMAGE):$(VERSION)
+	@$(DOCKER) run --rm=true -p 8083:8083 -p 8086:8086 --name $(NAMESPACE)_$(IMAGE) $(NAMESPACE)/$(IMAGE):$(VERSION)
+
+.PHONY: debug
+debug:
+	@echo -e "$(OK_COLOR)[$(APP)] run $(NAMESPACE)/$(IMAGE):$(VERSION)$(NO_COLOR)"
+	@$(DOCKER) run -it --rm=true -p 8083:8083 -p 8086:8086 --name $(NAMESPACE)_$(IMAGE) $(NAMESPACE)/$(IMAGE):$(VERSION) /bin/bash
 
 .PHONY: login
 login:

diff --git a/README.md b/README.md
@@ -15,19 +15,17 @@ This image is based on the official Alpine Linux.
 
 Ports exported are : `8083` and `8086`.
 
-Volumes exported are : `/data`.
+Volume exported is : `/var/lib/influxdb`.
 
 ## Usage
 
-    $ docker run --rm=true -it -p 8083:8083 -p 8086:8086 portefaix/influxdb:0.9.4
+    $ docker run --rm=true -it -p 8083:8083 -p 8086:8086 portefaix/influxdb:0.9.6.1
 
 ## Supported tags
 
-- `0.11.0` [![](https://badge.imagelayers.io/portefaix/influxdb:0.11.0.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.11.0 'imagelayers.io')
-- `0.10.0` [![](https://badge.imagelayers.io/portefaix/influxdb:0.10.0.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.10.0 'imagelayers.io')
-- `0.9.6` [![](https://badge.imagelayers.io/portefaix/influxdb:0.9.6.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.9.6 'imagelayers.io')
-- `0.9.5` [![](https://badge.imagelayers.io/portefaix/influxdb:0.9.5.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.9.5 'imagelayers.io')
-- `0.9.4` [![](https://badge.imagelayers.io/portefaix/influxdb:0.9.4.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.9.4 'imagelayers.io')
+- `0.11.0.1` [![](https://badge.imagelayers.io/portefaix/influxdb:0.11.0.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.11.0.1 'imagelayers.io')
+- `0.10.3.1` [![](https://badge.imagelayers.io/portefaix/influxdb:0.10.3.1.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.10.3.1 'imagelayers.io')
+- `0.9.6.1` [![](https://badge.imagelayers.io/portefaix/influxdb:0.9.6.1.svg)](https://imagelayers.io/?images=portefaix/influxdb:0.9.6.1 'imagelayers.io')
 
 ## License