Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Debian Bullseye to Debian Bookworm #89

Merged
merged 2 commits into from
Feb 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7.16-slim-bullseye
FROM python:3.7.17-slim-bookworm

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

```console
docker run cisagov/scanner:1.3.6
docker run cisagov/scanner:1.3.7
```

### Running with Docker Compose ###
@@ -45,7 +45,7 @@ docker run cisagov/scanner:1.3.6

services:
scanner:
image: cisagov/scanner:1.3.6
image: cisagov/scanner:1.3.7
volumes:
- type: bind
source: <your_log_dir>
@@ -89,7 +89,7 @@ environment variables. See the
services:
scanner:
image: cisagov/scanner:1.3.6
image: cisagov/scanner:1.3.7
volumes:
- type: bind
source: <your_log_dir>
@@ -126,7 +126,7 @@ environment variables. See the
1. Pull the new image:

```console
docker pull cisagov/scanner:1.3.6
docker pull cisagov/scanner:1.3.7
```

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

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

```console
docker build \
--build-arg VERSION=1.3.6 \
--tag cisagov/scanner:1.3.6 \
--build-arg VERSION=1.3.7 \
--tag cisagov/scanner:1.3.7 \
https://github.com/cisagov/scanner.git#develop
```

@@ -231,9 +231,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=1.3.6 \
--build-arg VERSION=1.3.7 \
--output type=docker \
--tag cisagov/scanner:1.3.6 .
--tag cisagov/scanner:1.3.7 .
```

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