Skip to content

Commit

Permalink
Merge pull request #52 from cisagov/improvement/upgrade-base-docker-i…
Browse files Browse the repository at this point in the history
…mage

Upgrade base Docker image to Debian Bullseye
  • Loading branch information
jsf9k authored Oct 19, 2022
2 parents 57e991b + afb9f39 commit d107a5d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG VERSION=unspecified

FROM debian:buster-slim
FROM debian:bullseye-slim

ARG VERSION

Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Creates a Docker container with an installation of the
To run the `cisagov/gophish` image via Docker:

```console
docker run cisagov/gophish:0.0.6
docker run cisagov/gophish:0.0.7
```

### Running with Docker Compose ###
Expand All @@ -33,7 +33,7 @@ docker run cisagov/gophish:0.0.6

services:
gophish:
image: cisagov/gophish:0.0.6
image: cisagov/gophish:0.0.7
ports:
- target: 3333
published: 3333
Expand Down Expand Up @@ -81,7 +81,7 @@ environment variables. See the
services:
gophish:
image: cisagov/gophish:0.0.6
image: cisagov/gophish:0.0.7
ports:
- target: 3333
published: 3333
Expand Down Expand Up @@ -131,7 +131,7 @@ environment variables. See the
1. Pull the new image:

```console
docker pull cisagov/gophish:0.0.6
docker pull cisagov/gophish:0.0.7
```

1. Recreate and run the container by following the [previous instructions](#running-with-docker).
Expand All @@ -141,11 +141,11 @@ environment variables. See the
The images of this container are tagged with [semantic
versions](https://semver.org) of the underlying gophish project that they
containerize. It is recommended that most users use a version tag (e.g.
`:0.0.6`).
`:0.0.7`).

| Image:tag | Description |
|-----------|-------------|
|`cisagov/gophish:0.0.6`| An exact release version. |
|`cisagov/gophish:0.0.7`| An exact release version. |
|`cisagov/gophish:0.0`| The most recent release matching the major and minor version numbers. |
|`cisagov/gophish:0`| The most recent release matching the major version number. |
|`cisagov/gophish:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
Expand Down Expand Up @@ -211,8 +211,8 @@ Build the image locally using this git repository as the [build context](https:/

```console
docker build \
--build-arg VERSION=0.0.6 \
--tag cisagov/gophish:0.0.6 \
--build-arg VERSION=0.0.7 \
--tag cisagov/gophish:0.0.7 \
https://github.com/cisagov/gophish-docker.git#develop
```

Expand Down Expand Up @@ -242,9 +242,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=0.0.6 \
--build-arg VERSION=0.0.7 \
--output type=docker \
--tag cisagov/gophish:0.0.6 .
--tag cisagov/gophish:0.0.7 .
```

## Contributing ##
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
# Note build arguments here are for builds using docker-compose (pytest)
# The CI build workflow uses docker and passes the value from bump_version
args:
- VERSION=0.0.6
- VERSION=0.0.7
context: .
dockerfile: Dockerfile
image: cisagov/gophish
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.6"
__version__ = "0.0.7"

0 comments on commit d107a5d

Please sign in to comment.