From 380b3332aeb885301a3810d85f5f842c3112a38e Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:48:47 -0400 Subject: [PATCH 1/6] Bump from Python 3.10.10 to 3.10.11 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2214085..8755274 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,8 @@ RUN apk --no-cache add \ 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 @@ -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 From fc457c5267776a4908685295ecdedda9e5d877ac Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:52:45 -0400 Subject: [PATCH 2/6] Update core Python packages installed in the venv - Bump setuptools from 67.6.0 to 67.6.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8755274..ed3bf9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ 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 \ From fd17f63da742a82a85be187423462627c6995966 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:54:01 -0400 Subject: [PATCH 3/6] Install the latest package versions available Update the versions installed with apk in the Dockerfile. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed3bf9f..5996231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ 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 \ @@ -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 From 762201b6b440fe71759953fb7aa32c13391f3e33 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:56:56 -0400 Subject: [PATCH 4/6] Update the pipenv managed dependencies Update these dependencies by running `pipenv lock` in the `src/` directory. --- src/Pipfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Pipfile.lock b/src/Pipfile.lock index 8bb898a..f06506d 100644 --- a/src/Pipfile.lock +++ b/src/Pipfile.lock @@ -25,11 +25,11 @@ }, "beautifulsoup4": { "hashes": [ - "sha256:2130a5ad7f513200fae61a17abb5e338ca980fa28c439c0571014bc0217e9591", - "sha256:c5fceeaec29d09c84970e47c65f2f0efe57872f7cff494c9691a26ec0ff13234" + "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da", + "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a" ], "markers": "python_full_version >= '3.6.0'", - "version": "==4.12.0" + "version": "==4.12.2" }, "certifi": { "hashes": [ @@ -152,11 +152,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:43ce9281e097583d758c2c708c4376371261a02c34682491a8e98352365aad20", - "sha256:ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09" + "sha256:23c2bcae4762dfb0bbe072d358faec24957901d75b6c4ab11172c0c982532402", + "sha256:8f8bd2af397cf33bd344d35cfe7f489219b7d14fc79a3f854b75b8417e9226b0" ], "markers": "python_version >= '3.7'", - "version": "==6.1.0" + "version": "==6.3.0" }, "lxml": { "hashes": [ @@ -273,11 +273,11 @@ }, "setuptools": { "hashes": [ - "sha256:2ee892cd5f29f3373097f5a814697e397cf3ce313616df0af11231e2ad118077", - "sha256:b78aaa36f6b90a074c1fa651168723acbf45d14cb1196b6f02c0fd07f17623b2" + "sha256:257de92a9d50a60b8e22abfcbb771571fde0dbf3ec234463212027a4eeecbe9a", + "sha256:e728ca814a823bf7bf60162daf9db95b93d532948c4c0bea762ce62f60189078" ], "markers": "python_version >= '3.7'", - "version": "==67.6.0" + "version": "==67.6.1" }, "soupsieve": { "hashes": [ From 2c41c70a1df9d9f078f859e1722258ebcaceabf1 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:58:08 -0400 Subject: [PATCH 5/6] Bump version from 0.1.0 to 0.2.0 --- README.md | 16 ++++++++-------- src/version.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8ed31bb..44803ee 100644 --- a/README.md +++ b/README.md @@ -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 ``` ### Running with Docker Compose ### @@ -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' volumes: - .:/task/host_mount ``` @@ -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 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -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`). | 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`| 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. | @@ -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 \ https://github.com/cisagov/vdp-scanner-docker.git#develop ``` @@ -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 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 3dc1f76..d3ec452 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.1.0" +__version__ = "0.2.0" From d74c6d5e0e69d1437fde13f1f500dea371039c2e Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:59:47 -0400 Subject: [PATCH 6/6] Bump version from 0.2.0 to 0.2.0-dev.1 --- README.md | 14 +++++++------- src/version.txt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 44803ee..a53687d 100644 --- a/README.md +++ b/README.md @@ -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.2.0 +docker run cisagov/vdp-scanner:0.2.0-dev.1 ``` ### Running with Docker Compose ### @@ -36,7 +36,7 @@ docker run cisagov/vdp-scanner:0.2.0 services: vdp-scanner: - image: 'cisagov/vdp-scanner:0.2.0' + image: 'cisagov/vdp-scanner:0.2.0-dev.1' volumes: - .:/task/host_mount ``` @@ -74,7 +74,7 @@ docker run cisagov/vdp-scanner:0.2.0 1. Pull the new image: ```console - docker pull cisagov/vdp-scanner:0.2.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). @@ -83,11 +83,11 @@ docker run cisagov/vdp-scanner:0.2.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.2.0`). +a version tag (e.g. `:0.2.0-dev.1`). | Image:tag | Description | |-----------|-------------| -|`cisagov/vdp-scanner:0.2.0`| An exact release version. | +|`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. | @@ -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.2.0 \ + --tag cisagov/vdp-scanner:0.2.0-dev.1 \ https://github.com/cisagov/vdp-scanner-docker.git#develop ``` @@ -184,7 +184,7 @@ Docker: --file Dockerfile-x \ --platform linux/amd64 \ --output type=docker \ - --tag cisagov/vdp-scanner:0.2.0 . + --tag cisagov/vdp-scanner:0.2.0-dev.1 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index d3ec452..efc960d 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.2.0" +__version__ = "0.2.0-dev.1"