Skip to content

Commit

Permalink
Merge pull request #82 from cisagov/dependabot/pip/src/urllib3-1.26.18
Browse files Browse the repository at this point in the history
Bump urllib3 from 1.26.15 to 1.26.18 in /src
  • Loading branch information
jsf9k authored Oct 19, 2023
2 parents 0e799b5 + 678aef7 commit 5c16344
Show file tree
Hide file tree
Showing 4 changed files with 222 additions and 219 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ RUN apk --no-cache add \
git=2.38.5-r0 \
libffi-dev=3.4.4-r0 \
musl-dev=1.2.3-r5 \
openssl-dev=3.0.9-r3 \
openssl-dev=3.0.11-r0 \
py3-pip=22.3.1-r1 \
py3-setuptools=65.6.0-r0 \
py3-wheel=0.38.4-r0 \
python3-dev=3.10.12-r0 \
python3=3.10.12-r0
python3-dev=3.10.13-r0 \
python3=3.10.13-r0

# Copy in our custom Cargo configuration file
COPY src/config.toml /root/.cargo/
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.1.1
docker run cisagov/code-gov-update:0.1.2
```

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

services:
update:
image: 'cisagov/code-gov-update:0.1.1'
image: 'cisagov/code-gov-update:0.1.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.1.1'
image: 'cisagov/code-gov-update:0.1.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.1.1
docker pull cisagov/code-gov-update:0.1.2
```

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). It is recommended that most users use a version
tag (e.g. `:0.1.1`).
tag (e.g. `:0.1.2`).

| Image:tag | Description |
|-----------|-------------|
|`cisagov/code-gov-update:0.1.1`| An exact release version. |
|`cisagov/code-gov-update:0.1.2`| An exact release version. |
|`cisagov/code-gov-update:0.1`| 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 @@ -209,7 +209,7 @@ Build the image locally using this git repository as the [build context](https:/

```console
docker build \
--tag cisagov/code-gov-update:0.1.1 \
--tag cisagov/code-gov-update:0.1.2 \
https://github.com/cisagov/code-gov-update.git#develop
```

Expand Down Expand Up @@ -240,7 +240,7 @@ Docker:
--file Dockerfile-x \
--platform linux/amd64 \
--output type=docker \
--tag cisagov/code-gov-update:0.1.1 .
--tag cisagov/code-gov-update:0.1.2 .
```

## Contributing ##
Expand Down
Loading

0 comments on commit 5c16344

Please sign in to comment.