Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfile Versions #18

Merged
merged 3 commits into from
Aug 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PY_VERSION=3.9.6

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

# For a list of pre-defined annotation keys and value types see:
# https://github.com/opencontainers/image-spec/blob/master/annotations.md
Expand All @@ -10,8 +10,8 @@ LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security

RUN apt-get update \
&& apt-get install -y --allow-downgrades --no-install-recommends \
libxml2-dev=2.9.4+dfsg1-7+deb10u2 \
libxslt1-dev=1.1.32-2.2~deb10u1
libxml2-dev=2.9.10+dfsg-6.7 \
libxslt1-dev=1.1.34-4

ENV PY_VENV=/.venv

Expand All @@ -36,18 +36,15 @@ RUN PIPENV_VENV_IN_PROJECT=1 pipenv sync
# as a last step.
RUN python -m pip uninstall --yes pipenv

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

RUN apt-get update \
&& apt-get install -y --allow-downgrades --no-install-recommends \
ca-certificates=20200601~deb10u2 \
# This is the latest version of the chromium package that is available for
# all of our supported platforms. Since it depends on the chromium-common
# package of the same version we need to force installation of that as well.
chromium=89.0.4389.114-1~deb10u1 \
chromium-common=89.0.4389.114-1~deb10u1 \
libxml2-dev=2.9.4+dfsg1-7+deb10u2 \
libxslt1-dev=1.1.32-2.2~deb10u1 \
ca-certificates=20210119 \
chromium=90.0.4430.212-1 \
chromium-common=90.0.4430.212-1 \
libxml2-dev=2.9.10+dfsg-6.7 \
libxslt1-dev=1.1.34-4 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Python library. Then it will output CSVs with agency and domain level results.
To run the `cisagov/vdp-scanner` image via Docker:

```console
docker run cisagov/vdp-scanner:0.0.3
docker run cisagov/vdp-scanner:0.0.4
```

### Running with Docker Compose ###
Expand All @@ -38,7 +38,7 @@ docker run cisagov/vdp-scanner:0.0.3

services:
vdp-scanner:
image: 'cisagov/vdp-scanner:0.0.3'
image: 'cisagov/vdp-scanner:0.0.4'
volumes:
- .:/task/host_mount
```
Expand Down Expand Up @@ -76,7 +76,7 @@ docker run cisagov/vdp-scanner:0.0.3
1. Pull the new image:

```console
docker pull cisagov/vdp-scanner:0.0.3
docker pull cisagov/vdp-scanner:0.0.4
```

1. Recreate and run the container by following the [previous instructions](#running-with-docker).
Expand All @@ -85,11 +85,11 @@ docker run cisagov/vdp-scanner:0.0.3

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/vdp-scanner:0.0.3`| An exact release version. |
|`cisagov/vdp-scanner:0.0.4`| An exact release version. |
|`cisagov/vdp-scanner:0.0`| The most recent release matching the major and minor version numbers. |
|`cisagov/vdp-scanner:0`| The most recent release matching the major version number. |
|`cisagov/vdp-scanner:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
Expand Down Expand Up @@ -155,7 +155,7 @@ Build the image locally using this git repository as the [build context](https:/

```console
docker build \
--tag cisagov/vdp-scanner:0.0.3 \
--tag cisagov/vdp-scanner:0.0.4 \
https://github.com/cisagov/vdp-scanner-docker.git#develop
```

Expand Down Expand Up @@ -186,7 +186,7 @@ Docker:
--file Dockerfile-x \
--platform linux/amd64 \
--output type=docker \
--tag cisagov/vdp-scanner:0.0.3 .
--tag cisagov/vdp-scanner:0.0.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__ = "0.0.3"
__version__ = "0.0.4"