diff --git a/.circleci/config.yml b/.circleci/config.yml
index a5100cdb5d2..f0e9ee20585 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -195,7 +195,7 @@ jobs:
 
   build-all:
     docker:
-     - image: grafana/build-container:1.2.11
+      - image: grafana/build-container:1.2.11
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -239,7 +239,7 @@ jobs:
 
   build:
     docker:
-     - image: grafana/build-container:1.2.11
+      - image: grafana/build-container:1.2.11
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -268,7 +268,7 @@ jobs:
 
   build-fast-backend:
     docker:
-     - image: grafana/build-container:1.2.11
+      - image: grafana/build-container:1.2.11
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -285,7 +285,7 @@ jobs:
 
   build-fast-frontend:
     docker:
-     - image: grafana/build-container:1.2.11
+      - image: grafana/build-container:1.2.11
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -309,7 +309,7 @@ jobs:
 
   build-fast-package:
     docker:
-     - image: grafana/build-container:1.2.11
+      - image: grafana/build-container:1.2.11
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -336,7 +336,7 @@ jobs:
 
   build-fast-save:
     docker:
-     - image: grafana/build-container:1.2.11
+      - image: grafana/build-container:1.2.11
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -466,7 +466,7 @@ jobs:
 
   build-enterprise:
     docker:
-     - image: grafana/build-container:1.2.11
+      - image: grafana/build-container:1.2.11
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -574,7 +574,7 @@ jobs:
     steps:
       - checkout
       - attach_workspace:
-         at: .
+          at: .
       - run:
           name: gcp credentials
           command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 3e6ddba6fe0..cc37f9d467e 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -26,6 +26,21 @@ WORKDIR $GF_PATHS_HOME
 RUN apk add --no-cache ca-certificates bash tzdata && \
     apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils
 
+# Oracle Support for x86_64 only
+RUN if [ `arch` = "x86_64" ]; then \
+      apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community libaio libnsl && \
+      ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk \
+        -O /tmp/glibc-2.30-r0.apk && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-bin-2.30-r0.apk \
+        -O /tmp/glibc-bin-2.30-r0.apk && \
+      apk add --allow-untrusted /tmp/glibc-2.30-r0.apk /tmp/glibc-bin-2.30-r0.apk && \
+      rm -f /tmp/glibc-2.30-r0.apk && \
+      rm -f /tmp/glibc-bin-2.30-r0.apk && \
+      rm -f /lib/ld-linux-x86-64.so.2 && \
+      rm -f /etc/ld.so.cache; \
+    fi
+
 # PhantomJS
 RUN if [ `arch` = "x86_64" ]; then \
       apk add --no-cache --virtual phantomjs-utils curl && \