diff --git a/Dockerfile b/Dockerfile index 9f07dc79c1d..a00668414b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi WORKDIR $GF_PATHS_HOME RUN apt-get update && apt-get upgrade -y && \ - apt-get install -qq -y libfontconfig ca-certificates && \ + apt-get install -qq -y libfontconfig1 ca-certificates && \ apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* diff --git a/build.go b/build.go index 3a9a7598b72..378c38b6c05 100644 --- a/build.go +++ b/build.go @@ -270,7 +270,7 @@ func createDebPackages() { defaultFileSrc: "packaging/deb/default/grafana-server", systemdFileSrc: "packaging/deb/systemd/grafana-server.service", - depends: []string{"adduser", "libfontconfig"}, + depends: []string{"adduser", "libfontconfig1"}, }) } diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index dc522ce6111..c22d7814cb6 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -27,7 +27,7 @@ installation. ```bash wget -sudo apt-get install -y adduser libfontconfig +sudo apt-get install -y adduser libfontconfig1 sudo dpkg -i grafana__amd64.deb ``` @@ -35,7 +35,7 @@ Example: ```bash wget https://dl.grafana.com/oss/release/grafana_5.4.2_amd64.deb -sudo apt-get install -y adduser libfontconfig +sudo apt-get install -y adduser libfontconfig1 sudo dpkg -i grafana_5.4.2_amd64.deb ``` diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md index 209f69e26dd..aebf76090f3 100644 --- a/docs/sources/reference/sharing.md +++ b/docs/sources/reference/sharing.md @@ -39,7 +39,7 @@ Click a panel title to open the panel menu, then click share in the panel menu t ### Direct Link Rendered Image -You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `tools/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig) are available. +You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `tools/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig1) are available. Example of a link to a server-side rendered PNG: diff --git a/packaging/conf/nfpm.yaml b/packaging/conf/nfpm.yaml index 6eafe22e250..891cae233c7 100644 --- a/packaging/conf/nfpm.yaml +++ b/packaging/conf/nfpm.yaml @@ -11,7 +11,7 @@ provides: - grafana-cli depends: - adduser -- libfontconfig +- libfontconfig1 maintainer: "" description: | Grafana diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 58fa8dae64c..3980e4bf5d8 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -29,7 +29,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi WORKDIR $GF_PATHS_HOME RUN apt-get update && apt-get -y upgrade && \ - apt-get install -qq -y libfontconfig ca-certificates curl && \ + apt-get install -qq -y libfontconfig1 ca-certificates curl && \ apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/*