Skip to content

Commit

Permalink
Merge pull request #178 from cisagov/maintenance/update_dependencies
Browse files Browse the repository at this point in the history
Update image dependencies
  • Loading branch information
mcdonnnj authored Jan 15, 2025
2 parents e0869c1 + 20de684 commit 2514caa
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ ENV CISA_HOME="/home/${CISA_USER}"
ENV VIRTUAL_ENV="${CISA_HOME}/.venv"

# Versions of the Python packages installed directly
ENV PYTHON_PIP_VERSION=24.2
ENV PYTHON_PIPENV_VERSION=2024.1.0
ENV PYTHON_SETUPTOOLS_VERSION=75.1.0
ENV PYTHON_WHEEL_VERSION=0.44.0
ENV PYTHON_PIP_VERSION=24.3.1
ENV PYTHON_PIPENV_VERSION=2024.4.0
ENV PYTHON_SETUPTOOLS_VERSION=75.8.0
ENV PYTHON_WHEEL_VERSION=0.45.1

# Install the system package dependencies necessary to set up the image's Python
# virtual environment.
Expand Down Expand Up @@ -97,7 +97,7 @@ ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
# estimate labor hours for code.
RUN apk --no-cache add \
cloc=2.02-r0 \
git=2.47.1-r0 \
git=2.47.2-r0 \
py3-cryptography=44.0.0-r0

###
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ hosted [here](https://www.dhs.gov/code.json).
To run the `cisagov/code-gov-update` image via Docker:

```console
docker run cisagov/code-gov-update:0.3.0-rc.1
docker run cisagov/code-gov-update:0.3.0-rc.2
```

### Running with Docker Compose ###
Expand All @@ -44,7 +44,7 @@ docker run cisagov/code-gov-update:0.3.0-rc.1

services:
update:
image: cisagov/code-gov-update:0.3.0-rc.1
image: cisagov/code-gov-update:0.3.0-rc.2
init: true
environment:
- AWS_CONFIG_FILE=path/to/aws_config
Expand Down Expand Up @@ -92,7 +92,7 @@ environment variables. See the
services:
update:
image: cisagov/code-gov-update:0.3.0-rc.1
image: cisagov/code-gov-update:0.3.0-rc.2
init: true
secrets:
- source: aws_config
Expand Down Expand Up @@ -131,7 +131,7 @@ environment variables. See the
1. Pull the new image:

```console
docker pull cisagov/code-gov-update:0.3.0-rc.1
docker pull cisagov/code-gov-update:0.3.0-rc.2
```

1. Recreate and run the container by following the [previous instructions](#running-with-docker).
Expand Down Expand Up @@ -170,11 +170,11 @@ and then update dependencies as you would above.
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.
`:0.3.0-rc.1`).
`:0.3.0-rc.2`).

| Image:tag | Description |
|-----------|-------------|
|`cisagov/code-gov-update:0.3.0-rc.1`| An exact release version. |
|`cisagov/code-gov-update:0.3.0-rc.2`| An exact release version. |
|`cisagov/code-gov-update:0.3`| The most recent release matching the major and minor version numbers. |
|`cisagov/code-gov-update:0`| The most recent release matching the major version number. |
|`cisagov/code-gov-update:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
Expand Down Expand Up @@ -239,7 +239,7 @@ Build the image locally using this git repository as the [build context](https:/

```console
docker build \
--tag cisagov/code-gov-update:0.3.0-rc.1 \
--tag cisagov/code-gov-update:0.3.0-rc.2 \
https://github.com/cisagov/code-gov-update.git#develop
```

Expand Down Expand Up @@ -270,7 +270,7 @@ Docker:
--file Dockerfile-x \
--platform linux/amd64 \
--output type=docker \
--tag cisagov/code-gov-update:0.3.0-rc.1 .
--tag cisagov/code-gov-update:0.3.0-rc.2 .
```

## Contributing ##
Expand Down
12 changes: 6 additions & 6 deletions src/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0-rc.1
0.3.0-rc.2

0 comments on commit 2514caa

Please sign in to comment.