-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into release
- Loading branch information
Showing
6 changed files
with
399 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
FROM centos:7 | ||
|
||
ENV GRAFANA_VERSION 4.1.2-1486989747 | ||
ENV GF_PATHS_DATA /var/lib/grafana/data | ||
|
||
# Install grafana | ||
RUN yum install -y https://grafanarel.s3.amazonaws.com/builds/grafana-${GRAFANA_VERSION}.x86_64.rpm && \ | ||
yum install -y unzip && \ | ||
yum clean all | ||
|
||
COPY dist /var/lib/grafana/plugins/hawkular-datasource | ||
|
||
# Fix permissions so will run on OCP under "restricted" SCC | ||
COPY ./run.sh /run.sh | ||
COPY fix-permissions /usr/bin/fix-permissions | ||
|
||
RUN chmod +x /usr/bin/fix-permissions && \ | ||
/usr/bin/fix-permissions /run.sh && \ | ||
/usr/bin/fix-permissions /var/lib/grafana && \ | ||
/usr/bin/fix-permissions /var/log/grafana && \ | ||
/usr/bin/fix-permissions /etc/grafana | ||
|
||
EXPOSE 3000 | ||
|
||
ENTRYPOINT ["/run.sh"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Building a development Docker image | ||
|
||
1. Build the plugin from repository root: | ||
|
||
```bash | ||
grunt | ||
``` | ||
|
||
2. Move (or copy) the `dist` directory to `docker/` and `cd` to it. | ||
|
||
```bash | ||
mv dist docker && cd docker | ||
``` | ||
|
||
3. Build the docker image from Dockerfile.dev | ||
|
||
```bash | ||
docker build -f Dockerfile.dev -t hawkular/hawkular-grafana-datasource:dev-build . | ||
``` | ||
|
||
4. Test the image | ||
|
||
```bash | ||
docker run -i -p 3000:3000 --name hawkular-grafana-datasource --rm hawkular/hawkular-grafana-datasource:dev-build | ||
``` | ||
|
||
And login on http://localhost:3000/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.