Skip to content

Commit

Permalink
Merge pull request #21 from cisagov/improvement/use-latest-python-bas…
Browse files Browse the repository at this point in the history
…e-docker-image

Use the latest version of the Python Docker base image
  • Loading branch information
jsf9k authored Sep 29, 2022
2 parents 4e68cc0 + fea9c45 commit 0ae1afa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VERSION=unspecified
ARG PY_VERSION=3.10.0
ARG PY_VERSION=3.10.7

FROM python:${PY_VERSION}-slim-bullseye AS compile-stage

Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ composition](https://docs.docker.com/compose/) alongside only the
To run the `cisagov/guacscanner` image via Docker:

```console
docker run cisagov/guacscanner:1.1.14
docker run cisagov/guacscanner:1.1.15
```

### Running with Docker Compose ###
Expand Down Expand Up @@ -82,7 +82,7 @@ Docker secrets.
1. Pull the new image:

```console
docker pull cisagov/guacscanner:1.1.14
docker pull cisagov/guacscanner:1.1.15
```

1. Recreate and run the container by following the [previous
Expand All @@ -93,11 +93,11 @@ Docker secrets.
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.1.14`).
tag (e.g. `:1.1.15`).

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

```console
docker build \
--build-arg VERSION=1.1.14 \
--tag cisagov/guacscanner:1.1.14 \
--build-arg VERSION=1.1.15 \
--tag cisagov/guacscanner:1.1.15 \
https://github.com/cisagov/guacscanner.git#develop
```

Expand Down Expand Up @@ -204,9 +204,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=1.1.14 \
--build-arg VERSION=1.1.15 \
--output type=docker \
--tag cisagov/guacscanner:1.1.14 .
--tag cisagov/guacscanner:1.1.15 .
```

## 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.1.14"
__version__ = "1.1.15"

0 comments on commit 0ae1afa

Please sign in to comment.