Skip to content

Commit

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

Update base Docker image to Python 3.11.3
  • Loading branch information
jsf9k authored Apr 17, 2023
2 parents dcaa0cb + a5964df commit 53d2a47
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11.1-slim-bullseye
FROM python:3.11.3-slim-bullseye

###
# For a list of pre-defined annotation keys and value types see:
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ expects the secrets in a different location.
To run the `cisagov/gatherer` image via Docker:

```console
docker run cisagov/gatherer:1.5.12
docker run cisagov/gatherer:1.5.13
```

### Running with Docker Compose ###
Expand All @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.12

services:
gatherer:
image: cisagov/gatherer:1.5.12
image: cisagov/gatherer:1.5.13
volumes:
- type: bind
source: <your_output_dir>
Expand Down Expand Up @@ -93,7 +93,7 @@ environment variables. See the
services:
gatherer:
image: cisagov/gatherer:1.5.12
image: cisagov/gatherer:1.5.13
volumes:
- type: bind
source: <your_output_dir>
Expand Down Expand Up @@ -130,7 +130,7 @@ environment variables. See the
1. Pull the new image:

```console
docker pull cisagov/gatherer:1.5.12
docker pull cisagov/gatherer:1.5.13
```

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

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

```console
docker build \
--build-arg VERSION=1.5.12 \
--tag cisagov/gatherer:1.5.12 \
--build-arg VERSION=1.5.13 \
--tag cisagov/gatherer:1.5.13 \
https://github.com/cisagov/gatherer.git#develop
```

Expand Down Expand Up @@ -238,9 +238,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=1.5.12 \
--build-arg VERSION=1.5.13 \
--output type=docker \
--tag cisagov/gatherer:1.5.12 .
--tag cisagov/gatherer:1.5.13 .
```

## Contributing ##
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.5.12"
__version__ = "1.5.13"

0 comments on commit 53d2a47

Please sign in to comment.