Skip to content

Commit

Permalink
Merge pull request #29 from cisagov/improvement/pin_dependencies
Browse files Browse the repository at this point in the history
Pin the Dependencies Used
  • Loading branch information
mcdonnnj authored Oct 7, 2021
2 parents d334efd + 8ce3a52 commit 887d96d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
13 changes: 10 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG VERSION=unspecified

FROM certbot/dns-route53
FROM certbot/dns-route53:v1.19.0

ARG VERSION

Expand All @@ -10,8 +10,15 @@ ARG VERSION
LABEL org.opencontainers.image.authors="[email protected]"
LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency"

RUN apk add python3
RUN pip3 install --upgrade pip && pip3 install --upgrade awscli boto3 docopt
RUN apk add --no-cache python3=3.8.10-r0
RUN pip3 install --no-cache-dir \
pip==21.2.4 \
setuptools==58.1.0 \
wheel==0.37.0
RUN pip3 install --no-cache-dir \
awscli==1.20.52 \
boto3==1.18.52 \
docopt==0.6.2
COPY src/rebuild-symlinks.py src/entrypoint.sh src/version.txt /opt/certbot/
COPY src/config /root/.aws/config
RUN ln -snf /run/secrets/credentials /root/.aws/credentials
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ want set:

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.0.3`).
a version tag (e.g. `:0.0.4`).

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

```console
docker build \
--build-arg VERSION=0.0.3 \
--tag cisagov/certboto:0.0.3 \
--build-arg VERSION=0.0.4 \
--tag cisagov/certboto:0.0.4 \
https://github.com/cisagov/certboto-docker.git#develop
```

Expand Down Expand Up @@ -256,9 +256,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=0.0.3 \
--build-arg VERSION=0.0.4 \
--output type=docker \
--tag cisagov/certboto:0.0.3 .
--tag cisagov/certboto:0.0.4 .
```

## AWS policies ##
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.3"
__version__ = "0.0.4"

0 comments on commit 887d96d

Please sign in to comment.