Merge pull request #125 from Guglio95/master

Fixed Dockerfile

Author: dpsoft

Dockerfile

@@ -8,11 +8,11 @@ FROM   alpine
 RUN     apk add --update --no-cache nginx nodejs nodejs-npm git curl wget gcc ca-certificates \
                                     python-dev py-pip musl-dev libffi-dev cairo supervisor bash \
                                     py-pyldap py-rrd                                                                 &&\
-        wget -q -O /etc/apk/keys/sgerrand.rsa.pub \
-                    https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub              &&\
-        wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.26-r0/glibc-2.26-r0.apk                &&\
-        apk add --no-cache  glibc-2.26-r0.apk                                                                        &&\
-        rm glibc-2.26-r0.apk                                                                                         &&\
+        apk --no-cache add ca-certificates wget                                                                      &&\
+        wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub                  &&\
+        wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk                &&\
+        apk add glibc-2.28-r0.apk                                                                                    &&\
+        rm glibc-2.28-r0.apk                                                                                         &&\
         adduser -D -u 1000 -g 'www' www                                                                              &&\
         pip install -U pip pytz gunicorn six --no-cache-dir                                                          &&\
         npm install -g wizzy                                                                                         &&\
@@ -43,7 +43,7 @@ RUN     git clone --depth=1 --branch master https://github.com/etsy/statsd.git /
 # Install Grafana
 RUN     mkdir /src/grafana                                                                                           &&\
         mkdir /opt/grafana                                                                                           &&\
-        curl https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.6.3.linux-x64.tar.gz \
+        curl https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.2.linux-amd64.tar.gz  \
              -o /src/grafana.tar.gz                                                                                  &&\
         tar -xzf /src/grafana.tar.gz -C /opt/grafana --strip-components=1                                            &&\
         rm /src/grafana.tar.gz
@@ -68,6 +68,7 @@ ADD     ./graphite/storage-schemas.conf /opt/graphite/conf/storage-schemas.conf
 ADD     ./graphite/storage-aggregation.conf /opt/graphite/conf/storage-aggregation.conf
 RUN     mkdir -p /opt/graphite/storage/whisper                                                                       &&\
         mkdir -p /opt/graphite/storage/log/webapp                                                                    &&\
+        touch /opt/graphite/storage/log/webapp/info.log                                                              &&\
         touch /opt/graphite/storage/graphite.db /opt/graphite/storage/index                                          &&\
         chown -R www /opt/graphite/storage                                                                           &&\
         chmod 0775 /opt/graphite/storage /opt/graphite/storage/whisper                                               &&\

nginx/nginx.conf

@@ -52,31 +52,6 @@ http {
         proxy_busy_buffers_size    64k;
         proxy_temp_file_write_size 64k;
     }
-    location /graphite/ {
-        proxy_pass                 http://127.0.0.1:8000/;
-        proxy_set_header           X-Real-IP   $remote_addr;
-        proxy_set_header           X-Forwarded-For  $proxy_add_x_forwarded_for;
-        proxy_set_header           X-Forwarded-Proto  $scheme;
-        proxy_set_header           X-Forwarded-Server  $host;
-        proxy_set_header           X-Forwarded-Host  $host;
-        proxy_set_header           Host  $host;
-
-        client_max_body_size       10m;
-        client_body_buffer_size    128k;
-
-        proxy_connect_timeout      90;
-        proxy_send_timeout         90;
-        proxy_read_timeout         90;
-
-        proxy_buffer_size          4k;
-        proxy_buffers              4 32k;
-        proxy_busy_buffers_size    64k;
-        proxy_temp_file_write_size 64k;
-
-        add_header Access-Control-Allow-Origin "*";
-        add_header Access-Control-Allow-Methods "GET, OPTIONS";
-        add_header Access-Control-Allow-Headers "origin, authorization, accept";
-    }
   }
 
   server {