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 image dependencies #73

Merged
merged 6 commits into from
Apr 12, 2023
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
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
# Versions of the Python packages installed directly
ENV PYTHON_PIP_VERSION=23.0.1
ENV PYTHON_PIPENV_VERSION=2023.3.20
ENV PYTHON_SETUPTOOLS_VERSION=67.6.0
ENV PYTHON_SETUPTOOLS_VERSION=67.6.1
ENV PYTHON_WHEEL_VERSION=0.40.0

RUN apk --no-cache add \
gcc=12.2.1_git20220924-r4 \
libc-dev=0.7.2-r3 \
libxml2-dev=2.10.3-r1 \
libxml2-dev=2.10.4-r0 \
libxslt-dev=1.1.37-r1 \
py3-pip=22.3.1-r1 \
py3-setuptools=65.6.0-r0 \
py3-wheel=0.38.4-r0 \
python3-dev=3.10.10-r0 \
python3=3.10.10-r0
python3-dev=3.10.11-r0 \
python3=3.10.11-r0

# Install pipenv to manage installing the Python dependencies into a created
# Python virtual environment. This is done separately from the virtual
Expand All @@ -58,7 +58,7 @@ RUN pipenv sync --clear --verbose

# The version of Python used here should match the version of the Alpine
# python3 package installed in the compile-stage.
FROM python:3.10.10-alpine3.17 AS build-stage
FROM python:3.10.11-alpine3.17 AS build-stage

# Unprivileged user information
ARG CISA_UID=2048
Expand All @@ -70,8 +70,8 @@ ENV VIRTUAL_ENV="${CISA_HOME}/.venv"

RUN apk --no-cache add \
ca-certificates=20220614-r4 \
chromium=110.0.5481.177-r0 \
libxml2=2.10.3-r1 \
chromium=112.0.5615.49-r0 \
libxml2=2.10.4-r0 \
libxslt=1.1.37-r1

# Create unprivileged user
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.1.0
docker run cisagov/vdp-scanner:0.2.0-dev.1
```

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

services:
vdp-scanner:
image: 'cisagov/vdp-scanner:0.1.0'
image: 'cisagov/vdp-scanner:0.2.0-dev.1'
volumes:
- .:/task/host_mount
```
Expand Down Expand Up @@ -74,7 +74,7 @@ docker run cisagov/vdp-scanner:0.1.0
1. Pull the new image:

```console
docker pull cisagov/vdp-scanner:0.1.0
docker pull cisagov/vdp-scanner:0.2.0-dev.1
```

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

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.0`).
a version tag (e.g. `:0.2.0-dev.1`).

| Image:tag | Description |
|-----------|-------------|
|`cisagov/vdp-scanner:0.1.0`| An exact release version. |
|`cisagov/vdp-scanner:0.1`| The most recent release matching the major and minor version numbers. |
|`cisagov/vdp-scanner:0.2.0-dev.1`| An exact release version. |
|`cisagov/vdp-scanner:0.2`| 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. |
|`cisagov/vdp-scanner:nightly` | A nightly build of the `develop` branch of this repository. |
Expand Down Expand Up @@ -153,7 +153,7 @@ Build the image locally using this git repository as the [build context](https:/

```console
docker build \
--tag cisagov/vdp-scanner:0.1.0 \
--tag cisagov/vdp-scanner:0.2.0-dev.1 \
https://github.com/cisagov/vdp-scanner-docker.git#develop
```

Expand Down Expand Up @@ -184,7 +184,7 @@ Docker:
--file Dockerfile-x \
--platform linux/amd64 \
--output type=docker \
--tag cisagov/vdp-scanner:0.1.0 .
--tag cisagov/vdp-scanner:0.2.0-dev.1 .
```

## Contributing ##
Expand Down
18 changes: 9 additions & 9 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 @@
__version__ = "0.1.0"
__version__ = "0.2.0-dev.1"