Use package libfontconfig1, instead of libfontconfig (#16548)

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
 WORKDIR $GF_PATHS_HOME
 
 
 RUN apt-get update && apt-get upgrade -y && \
 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 && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
     rm -rf /var/lib/apt/lists/*
 
 

build.go

@@ -270,7 +270,7 @@ func createDebPackages() {
 		defaultFileSrc: "packaging/deb/default/grafana-server",
 		defaultFileSrc: "packaging/deb/default/grafana-server",
 		systemdFileSrc: "packaging/deb/systemd/grafana-server.service",
 		systemdFileSrc: "packaging/deb/systemd/grafana-server.service",
 
 
-		depends: []string{"adduser", "libfontconfig"},
+		depends: []string{"adduser", "libfontconfig1"},
 	})
 	})
 }
 }
 
 

docs/sources/installation/debian.md

@@ -27,7 +27,7 @@ installation.
 
 
 ```bash
 ```bash
 wget <debian package url>
 wget <debian package url>
-sudo apt-get install -y adduser libfontconfig
+sudo apt-get install -y adduser libfontconfig1
 sudo dpkg -i grafana_<version>_amd64.deb
 sudo dpkg -i grafana_<version>_amd64.deb
 ```
 ```
 
 
@@ -35,7 +35,7 @@ Example:
 
 
 ```bash
 ```bash
 wget https://dl.grafana.com/oss/release/grafana_5.4.2_amd64.deb
 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
 sudo dpkg -i grafana_5.4.2_amd64.deb
 ```
 ```
 
 

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
 ### 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:
 Example of a link to a server-side rendered PNG:
 
 

packaging/conf/nfpm.yaml

@@ -11,7 +11,7 @@ provides:
 - grafana-cli
 - grafana-cli
 depends:
 depends:
 - adduser
 - adduser
-- libfontconfig
+- libfontconfig1
 maintainer: "<contact@grafana.com>"
 maintainer: "<contact@grafana.com>"
 description: |
 description: |
   Grafana
   Grafana

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
 WORKDIR $GF_PATHS_HOME
 
 
 RUN apt-get update && apt-get -y upgrade && \
 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 && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
     rm -rf /var/lib/apt/lists/*