IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Docker: Add dependencies to support oracle plugin in alpine (#20214)

Browse Source 
* add dependencies to support oracle plugin in alpine

* fix typo

* add generated docker image for PR to artifacts to make testing easier

* update path to artifact

* debug path to artifact

* debug path to artifact

* debug path to artifact

* fix ld.so.cache conflict

* only add glibc-compat for x86_64 builds

* do not store docker image in artifacts

* fix missing fi
This commit is contained in:
Brian Gann 2019-11-08 10:04:15 +01:00 committed by Marcus Efraimsson
parent dcfc74ef00
commit b63e4a9f52
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@ -195,7 +195,7 @@ jobs:
build-all: build-all:
docker: docker:
- image: grafana/build-container:1.2.11 - image: grafana/build-container:1.2.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -239,7 +239,7 @@ jobs:
build: build:
docker: docker:
- image: grafana/build-container:1.2.11 - image: grafana/build-container:1.2.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -268,7 +268,7 @@ jobs:
build-fast-backend: build-fast-backend:
docker: docker:
- image: grafana/build-container:1.2.11 - image: grafana/build-container:1.2.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -285,7 +285,7 @@ jobs:
build-fast-frontend: build-fast-frontend:
docker: docker:
- image: grafana/build-container:1.2.11 - image: grafana/build-container:1.2.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -309,7 +309,7 @@ jobs:
build-fast-package: build-fast-package:
docker: docker:
- image: grafana/build-container:1.2.11 - image: grafana/build-container:1.2.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -336,7 +336,7 @@ jobs:
build-fast-save: build-fast-save:
docker: docker:
- image: grafana/build-container:1.2.11 - image: grafana/build-container:1.2.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -466,7 +466,7 @@ jobs:
build-enterprise: build-enterprise:
docker: docker:
- image: grafana/build-container:1.2.11 - image: grafana/build-container:1.2.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -574,7 +574,7 @@ jobs:
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
name: gcp credentials name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json' command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'

15
packaging/docker/Dockerfile
View File

@ -26,6 +26,21 @@ WORKDIR $GF_PATHS_HOME
RUN apk add --no-cache ca-certificates bash tzdata && \ 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 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 # PhantomJS
RUN if [ `arch` = "x86_64" ]; then \ RUN if [ `arch` = "x86_64" ]; then \
apk add --no-cache --virtual phantomjs-utils curl && \ apk add --no-cache --virtual phantomjs-utils curl && \