浏览代码

tech(build): fixes broken yum installer

bergquist 9 年之前
父节点
当前提交
6b70fb2729
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 4 3
      scripts/build/Dockerfile
  2. 1 1
      scripts/build/deploy.sh

+ 4 - 3
scripts/build/Dockerfile

@@ -1,16 +1,17 @@
 FROM centos:6.6
 
+RUN yum install -y yum-plugin-ovl
 RUN yum install -y initscripts curl tar gcc libc6-dev git gcc-c++ openssl-devel
 RUN yum install -y g++ make automake autoconf curl-devel zlib-devel httpd-devel apr-devel apr-util-devel sqlite-devel
 RUN yum install -y wget yum-utils bzip2 bzip2-devel
 RUN yum install -y fontconfig freetype freetype-devel fontconfig-devel libstdc++
 RUN yum install -y rpm-build patch readline readline-devel libtool bison lzma
+RUN yum install -y which tar
 
 # Install RUBY 1.9.3
 # install necessary utilities
-RUN yum install -y which tar
+# RUN yum install -y which tar
 RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-#RUN curl -sSL https://get.rvm.io | bash -s stable
 RUN curl -sSl https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
 RUN source /etc/profile.d/rvm.sh
 RUN /bin/bash -l -c "rvm requirements"
@@ -33,7 +34,7 @@ RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 
-ADD ./scripts/build/build.sh /tmp/
+ADD build.sh /tmp/
 
 WORKDIR /tmp/
 

+ 1 - 1
scripts/build/deploy.sh

@@ -4,5 +4,5 @@ mkdir -p dist
 
 docker run -i -t --name gfbuild \
   -v $(pwd)/dist:/tmp/dist \
-  -e "GRAFANA_BRANCH=${GRAFANA_BRANCH}" \
+  -e "GRAFANA_BRANCH=${CIRCLE_BRANCH}" \
   grafana/buildcontainer