Skip to content

Commit

Permalink
Merge branch 'release-3.5.27-2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sameer Naik committed Jul 6, 2019
2 parents f971330 + 4a70857 commit 924b085
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions README.md
@@ -1,6 +1,6 @@
[![Circle CI](https://circleci.com/gh/sameersbn/docker-squid.svg?style=shield)](https://circleci.com/gh/sameersbn/docker-squid) [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/squid/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/squid)

# sameersbn/squid:3.5.27-1
# sameersbn/squid:3.5.27-2

- [Introduction](#introduction)
- [Contributing](#contributing)
Expand Down Expand Up @@ -52,7 +52,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/squid)
```bash
docker pull sameersbn/squid:3.5.27-1
docker pull sameersbn/squid:3.5.27-2
```

Alternatively you can build the image yourself.
Expand All @@ -69,7 +69,7 @@ Start Squid using:
docker run --name squid -d --restart=always \
--publish 3128:3128 \
--volume /srv/docker/squid/cache:/var/spool/squid \
sameersbn/squid:3.5.27-1
sameersbn/squid:3.5.27-2
```

*Alternatively, you can use the sample [docker-compose.yml](docker-compose.yml) file to start the container using [Docker Compose](https://docs.docker.com/compose/)*
Expand All @@ -82,7 +82,7 @@ You can customize the launch command of the Squid server by specifying arguments
docker run --name squid -it --rm \
--publish 3128:3128 \
--volume /srv/docker/squid/cache:/var/spool/squid \
sameersbn/squid:3.5.27-1 -h
sameersbn/squid:3.5.27-2 -h
```

## Persistence
Expand All @@ -107,7 +107,7 @@ docker run --name squid -d --restart=always \
--publish 3128:3128 \
--volume /path/to/squid.conf:/etc/squid/squid.conf \
--volume /srv/docker/squid/cache:/var/spool/squid \
sameersbn/squid:3.5.27-1
sameersbn/squid:3.5.27-2
```

To reload the Squid configuration on a running instance you can send the `HUP` signal to the container.
Expand Down Expand Up @@ -155,7 +155,7 @@ To upgrade to newer releases:
1. Download the updated Docker image:

```bash
docker pull sameersbn/squid:3.5.27-1
docker pull sameersbn/squid:3.5.27-2
```

2. Stop the currently running image:
Expand All @@ -175,7 +175,7 @@ To upgrade to newer releases:
```bash
docker run -name squid -d \
[OPTIONS] \
sameersbn/squid:3.5.27-1
sameersbn/squid:3.5.27-2
```

## Shell Access
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
3.5.27-1
3.5.27-2
2 changes: 1 addition & 1 deletion docker-compose.yml
@@ -1,5 +1,5 @@
Squid:
image: sameersbn/squid:3.5.27-1
image: sameersbn/squid:3.5.27-2
ports:
- "3128:3128"
volumes:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/pod.yml
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: squid
image: sameersbn/squid:3.5.27-1
image: sameersbn/squid:3.5.27-2
ports:
- containerPort: 3128
protocol: TCP
Expand Down

0 comments on commit 924b085

Please sign in to comment.