feat(influxdb): backport modules support to 1.7.x

influxdata · Apr 1, 2020 · 4d60807 · 4d60807
1 parent e9dff7b
commit 4d60807
Show file tree

Hide file tree

Showing 15 changed files with 676 additions and 1,587 deletions.
diff --git a/Dockerfile_build_ubuntu32 b/Dockerfile_build_ubuntu32
@@ -20,20 +20,20 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 
 RUN gem install fpm
 
-# Install go
-ENV GOPATH /root/go
-ENV GO_VERSION 1.12
-ENV GO_ARCH 386
-RUN wget --no-verbose https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
-   tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
-   rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
-ENV PATH /usr/local/go/bin:$PATH
+# setup environment
+ENV GO_VERSION  1.13.8
+ENV GOARCH      386
+ENV GOROOT      /usr/local/go
+ENV GOPATH      /root/go
+ENV PATH        $GOPATH/bin:$GOROOT/bin:$PATH
+ENV PROJECT_DIR /root/influxdb
+
+# install go
+RUN wget --no-verbose https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz -O- | tar -C /usr/local/ -zxf-
 
-ENV PROJECT_DIR $GOPATH/src/github.com/influxdata/influxdb
-ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p $PROJECT_DIR
-WORKDIR $PROJECT_DIR
 
+WORKDIR $PROJECT_DIR
 VOLUME $PROJECT_DIR
 
-ENTRYPOINT [ "/root/go/src/github.com/influxdata/influxdb/build.py" ]
+ENTRYPOINT [ "/root/influxdb/build.py" ]
diff --git a/Dockerfile_build_ubuntu64 b/Dockerfile_build_ubuntu64
@@ -22,20 +22,20 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 
 RUN gem install fpm
 
-# Install go
-ENV GOPATH /root/go
-ENV GO_VERSION 1.12
-ENV GO_ARCH amd64
-RUN wget --no-verbose https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
-   tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
-   rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
-ENV PATH /usr/local/go/bin:$PATH
+# setup environment
+ENV GO_VERSION  1.13.8
+ENV GOARCH      amd64
+ENV GOROOT      /usr/local/go
+ENV GOPATH      /root/go
+ENV PATH        $GOPATH/bin:$GOROOT/bin:$PATH
+ENV PROJECT_DIR /root/influxdb
+
+# install go
+RUN wget --no-verbose https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz -O- | tar -C /usr/local/ -zxf-
 
-ENV PROJECT_DIR $GOPATH/src/github.com/influxdata/influxdb
-ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p $PROJECT_DIR
-WORKDIR $PROJECT_DIR
 
-VOLUME $PROJECT_DIR
+WORKDIR $PROJECT_DIR
+VOLUME  $PROJECT_DIR
 
-ENTRYPOINT [ "/root/go/src/github.com/influxdata/influxdb/build.py" ]
+ENTRYPOINT [ "/root/influxdb/build.py" ]
diff --git a/Dockerfile_build_ubuntu64_go1.12 b/Dockerfile_build_ubuntu64_go1.12
@@ -0,0 +1,41 @@
+FROM ubuntu:xenial
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    python-software-properties \
+    software-properties-common \
+    wget \
+    git \
+    mercurial \
+    make \
+    ruby \
+    ruby-dev \
+    autoconf \
+    libtool \
+    build-essential \
+    rpm \
+    zip \
+    python \
+    python-boto \
+    asciidoc \
+    xmlto \
+    docbook-xsl
+
+RUN gem install fpm
+
+# setup environment
+ENV GO_VERSION  1.12
+ENV GOARCH      amd64
+ENV GOROOT      /usr/local/go
+ENV GOPATH      /root/go
+ENV PATH        $GOPATH/bin:$GOROOT/bin:$PATH
+ENV PROJECT_DIR /root/influxdb
+
+# install go
+RUN wget --no-verbose https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz -O- | tar -C /usr/local/ -zxf-
+
+RUN mkdir -p $PROJECT_DIR
+
+WORKDIR $PROJECT_DIR
+VOLUME  $PROJECT_DIR
+
+ENTRYPOINT [ "/root/influxdb/build.py" ]