Skip to content

Commit

Permalink
Updating some of the references to v1.3.0
Browse files Browse the repository at this point in the history
Adding an entry in the changelog to reference image name changes

Signed-off-by: Edward Welch <edward.welch@grafana.com>
  • Loading branch information
slim-bean committed Apr 1, 2020
1 parent 08aa2da commit 1c71195
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Before we get into new features, version 1.4.0 brings with it the first (that we

We have created a dedicated page for upgrading Loki in the [operations section of the docs](https://github.com/grafana/loki/tree/v1.4.0/docs/operations/upgrade.md)

The docker image tag naming was changed, the starting in 1.4.0 docker images no longer have the `v` prefix: `grafana/loki:1.4.0`

Also you should be aware we are now pruning old `master-xxxxx` docker images from docker hub, currently anything older than 90 days is removed. **We will never remove released versions of Loki**

### Notable Features
Expand Down
2 changes: 1 addition & 1 deletion docs/clients/promtail/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Every release includes binaries for Promtail which can be found on the

```bash
# modify tag to most recent version
$ docker pull grafana/promtail:v1.3.0
$ docker pull grafana/promtail:1.4.0
```

## Helm
Expand Down
10 changes: 5 additions & 5 deletions docs/installation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ For production, we recommend Tanka or Helm.
## Install with Docker

```bash
$ wget https://raw.githubusercontent.com/grafana/loki/v1.3.0/cmd/loki/loki-local-config.yaml -O loki-config.yaml
$ docker run -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:v1.3.0 -config.file=/mnt/config/loki-config.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.3.0/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
$ docker run -v $(pwd):/mnt/config -v /var/log:/var/log grafana/promtail:latest -config.file=/mnt/config/promtail-config.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.0/cmd/loki/loki-local-config.yaml -O loki-config.yaml
$ docker run -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:1.4.0 -config.file=/mnt/config/loki-config.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.0/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
$ docker run -v $(pwd):/mnt/config -v /var/log:/var/log grafana/promtail:1.4.0 -config.file=/mnt/config/promtail-config.yaml
```

## Install with Docker Compose

```bash
$ wget https://raw.githubusercontent.com/grafana/loki/v1.3.0/production/docker-compose.yaml -O docker-compose.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.0/production/docker-compose.yaml -O docker-compose.yaml
$ docker-compose -f docker-compose.yaml up
```
2 changes: 1 addition & 1 deletion docs/operations/loki-canary.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Loki Canary is also provided as a Docker container image:

```bash
# change tag to the most recent release
$ docker pull grafana/loki-canary:v1.3.0
$ docker pull grafana/loki-canary:1.4.0
```

### Kubernetes
Expand Down

0 comments on commit 1c71195

Please sign in to comment.