Skip to content

Commit

Permalink
Merge pull request #81 from cisagov/improvement/use-latest-python
Browse files Browse the repository at this point in the history
Update `Dockerfile` to use the latest Python version
  • Loading branch information
jsf9k authored Jan 31, 2024
2 parents 968c56d + 39a9d7e commit 40f4de9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM python:3.12.0-alpine
FROM python:3.12.1-alpine

###
# For a list of pre-defined annotation keys and value types see:
# https://github.com/opencontainers/image-spec/blob/master/annotations.md
#
# Note: Additional labels are added by the build workflow.
###
LABEL org.opencontainers.image.authors="vm-fusion-dev-group@trio.dhs.gov"
LABEL org.opencontainers.image.authors="vm-dev@gwe.cisa.dhs.gov"
LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency"

###
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ expects the secrets in a different location.
To run the `cisagov/saver` image via Docker:

```console
docker run cisagov/saver:1.3.3
docker run cisagov/saver:1.3.4
```

### Running with Docker Compose ###
Expand All @@ -46,7 +46,7 @@ docker run cisagov/saver:1.3.3

services:
saver:
image: cisagov/saver:1.3.3
image: cisagov/saver:1.3.4
volumes:
- type: bind
source: <your_log_dir>
Expand Down Expand Up @@ -92,7 +92,7 @@ environment variables. See the
services:
trustymail_reporter:
image: cisagov/saver:1.3.3
image: cisagov/saver:1.3.4
volumes:
- type: bind
source: <your_log_dir>
Expand Down Expand Up @@ -129,7 +129,7 @@ environment variables. See the
1. Pull the new image:

```console
docker pull cisagov/saver:1.3.3
docker pull cisagov/saver:1.3.4
```

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

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

```console
docker build \
--build-arg VERSION=1.3.3 \
--tag cisagov/saver:1.3.3 \
--build-arg VERSION=1.3.4 \
--tag cisagov/saver:1.3.4 \
https://github.com/cisagov/saver.git#develop
```

Expand Down Expand Up @@ -237,9 +237,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=1.3.3 \
--build-arg VERSION=1.3.4 \
--output type=docker \
--tag cisagov/saver:1.3.3 .
--tag cisagov/saver:1.3.4 .
```

## 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.3.3"
__version__ = "1.3.4"

0 comments on commit 40f4de9

Please sign in to comment.