Skip to content

Commit

Permalink
Merge pull request #231 from ds-wizard/hotfix/4.10.3
Browse files Browse the repository at this point in the history
Hotfix 4.10.3
  • Loading branch information
MarekSuchanek authored Sep 9, 2024
2 parents 6272a4a + a4955f6 commit 8c10449
Show file tree
Hide file tree
Showing 26 changed files with 88 additions and 35 deletions.
5 changes: 5 additions & 0 deletions packages/dsw-command-queue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

Released for version consistency with other DSW tools.

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -246,3 +250,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
4 changes: 2 additions & 2 deletions packages/dsw-command-queue/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-command-queue'
version = "4.10.2"
version = "4.10.3"
description = 'Library for working with command queue and persistent commands'
readme = 'README.md'
keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
Expand All @@ -25,7 +25,7 @@ classifiers = [
requires-python = '>=3.10, <4'
dependencies = [
# DSW
"dsw-database==4.10.2",
"dsw-database==4.10.3",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

Released for version consistency with other DSW tools.

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -258,3 +262,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
2 changes: 1 addition & 1 deletion packages/dsw-config/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-config'
version = "4.10.2"
version = "4.10.3"
description = 'Library for DSW config manipulation'
readme = 'README.md'
keywords = ['dsw', 'config', 'yaml', 'parser']
Expand Down
7 changes: 7 additions & 0 deletions packages/dsw-data-seeder/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

### Changed

- Updated to newer Docker base image due to vulnerabilities (CVE-2024-45490)[https://nvd.nist.gov/vuln/detail/CVE-2024-45490], (CVE-2024-45491)[https://nvd.nist.gov/vuln/detail/CVE-2024-45491], (CVE-2024-45492)[https://nvd.nist.gov/vuln/detail/CVE-2024-45492]

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -302,3 +308,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
4 changes: 2 additions & 2 deletions packages/dsw-data-seeder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datastewardshipwizard/python-base:4.9.1-3.11-basic as builder
FROM datastewardshipwizard/python-base:4.10.1-3.11-basic as builder

Check warning on line 1 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

WORKDIR /app

Expand All @@ -15,7 +15,7 @@ RUN python -m pip wheel --no-cache-dir --wheel-dir=/app/wheels -r /app/packages/
&& python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-data-seeder


FROM datastewardshipwizard/python-base:4.9.1-3.11-basic
FROM datastewardshipwizard/python-base:4.10.1-3.11-basic

ENV APPLICATION_CONFIG_PATH /app/config/application.yml

Check warning on line 20 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 20 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 20 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 20 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 20 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV WORKDIR_PATH /home/user/data

Check warning on line 21 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 21 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 21 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 21 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 21 in packages/dsw-data-seeder/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-data-seeder)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
Expand Down
2 changes: 1 addition & 1 deletion packages/dsw-data-seeder/dsw/data_seeder/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
DEFAULT_PLACEHOLDER = '<<|TENANT-ID|>>'
NULL_UUID = '00000000-0000-0000-0000-000000000000'
PROG_NAME = 'dsw-data-seeder'
VERSION = '4.10.2'
VERSION = '4.10.3'

VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
VAR_WORKDIR_PATH = 'WORKDIR_PATH'
Expand Down
10 changes: 5 additions & 5 deletions packages/dsw-data-seeder/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-data-seeder'
version = "4.10.2"
version = "4.10.3"
description = 'Worker for seeding DSW data'
readme = 'README.md'
keywords = ['data', 'database', 'seed', 'storage']
Expand All @@ -29,10 +29,10 @@ dependencies = [
'sentry-sdk',
'tenacity',
# DSW
"dsw-command-queue==4.10.2",
"dsw-config==4.10.2",
"dsw-database==4.10.2",
"dsw-storage==4.10.2",
"dsw-command-queue==4.10.3",
"dsw-config==4.10.3",
"dsw-database==4.10.3",
"dsw-storage==4.10.3",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-database/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

Released for version consistency with other DSW tools.

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -269,3 +273,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
4 changes: 2 additions & 2 deletions packages/dsw-database/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-database'
version = "4.10.2"
version = "4.10.3"
description = 'Library for managing DSW database'
readme = 'README.md'
keywords = ['dsw', 'database']
Expand All @@ -26,7 +26,7 @@ dependencies = [
'psycopg[binary]',
'tenacity',
# DSW
"dsw-config==4.10.2",
"dsw-config==4.10.3",
]

[project.urls]
Expand Down
7 changes: 7 additions & 0 deletions packages/dsw-document-worker/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

### Changed

- Updated to newer Docker base image due to vulnerabilities (CVE-2024-45490)[https://nvd.nist.gov/vuln/detail/CVE-2024-45490], (CVE-2024-45491)[https://nvd.nist.gov/vuln/detail/CVE-2024-45491], (CVE-2024-45492)[https://nvd.nist.gov/vuln/detail/CVE-2024-45492]

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -324,3 +330,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
4 changes: 2 additions & 2 deletions packages/dsw-document-worker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datastewardshipwizard/python-base:4.9.1-3.11-docworker as builder
FROM datastewardshipwizard/python-base:4.10.1-3.11-docworker as builder

Check warning on line 1 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

ARG TARGETARCH

Expand All @@ -17,7 +17,7 @@ RUN python -m pip wheel --wheel-dir=/app/wheels -r /app/packages/dsw-document-wo
&& python -m pip wheel --no-deps --wheel-dir=/app/wheels /app/packages/dsw-document-worker/addons/* \
&& python -m pip wheel --no-deps --wheel-dir=/app/wheels /app/packages/dsw-document-worker

FROM datastewardshipwizard/python-base:4.9.1-3.11-docworker
FROM datastewardshipwizard/python-base:4.10.1-3.11-docworker

ENV APPLICATION_CONFIG_PATH /app/config/application.yml

Check warning on line 22 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 22 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 22 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 22 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 22 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV WORKDIR_PATH /tmp/docworker

Check warning on line 23 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 23 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 23 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 23 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 23 in packages/dsw-document-worker/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-document-worker)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
Expand Down
2 changes: 1 addition & 1 deletion packages/dsw-document-worker/dsw/document_worker/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
EXIT_SUCCESS = 0
NULL_UUID = '00000000-0000-0000-0000-000000000000'
PROG_NAME = 'docworker'
VERSION = '4.10.2'
VERSION = '4.10.3'

VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
VAR_WORKDIR_PATH = 'WORKDIR_PATH'
Expand Down
10 changes: 5 additions & 5 deletions packages/dsw-document-worker/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-document-worker'
version = "4.10.2"
version = "4.10.3"
description = 'Worker for assembling and transforming documents'
readme = 'README.md'
keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker']
Expand Down Expand Up @@ -38,10 +38,10 @@ dependencies = [
'weasyprint',
'XlsxWriter',
# DSW
"dsw-command-queue==4.10.2",
"dsw-config==4.10.2",
"dsw-database==4.10.2",
"dsw-storage==4.10.2",
"dsw-command-queue==4.10.3",
"dsw-config==4.10.3",
"dsw-database==4.10.3",
"dsw-storage==4.10.3",
]

[project.urls]
Expand Down
7 changes: 7 additions & 0 deletions packages/dsw-mailer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

### Changed

- Updated to newer Docker base image due to vulnerabilities (CVE-2024-45490)[https://nvd.nist.gov/vuln/detail/CVE-2024-45490], (CVE-2024-45491)[https://nvd.nist.gov/vuln/detail/CVE-2024-45491], (CVE-2024-45492)[https://nvd.nist.gov/vuln/detail/CVE-2024-45492]

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -278,3 +284,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
4 changes: 2 additions & 2 deletions packages/dsw-mailer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datastewardshipwizard/python-base:4.9.1-3.11-basic as builder
FROM datastewardshipwizard/python-base:4.10.1-3.11-basic as builder

Check warning on line 1 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

WORKDIR /app

Expand All @@ -10,7 +10,7 @@ RUN python -m pip wheel --no-cache-dir --wheel-dir=/app/wheels -r /app/packages/
&& python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-database \
&& python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-mailer

FROM datastewardshipwizard/python-base:4.9.1-3.11-basic
FROM datastewardshipwizard/python-base:4.10.1-3.11-basic

ENV APPLICATION_CONFIG_PATH /app/config/application.yml

Check warning on line 15 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 15 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 15 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 15 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 15 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV WORKDIR_PATH /home/user/templates

Check warning on line 16 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 16 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 16 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 16 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 16 in packages/dsw-mailer/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-mailer)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
Expand Down
2 changes: 1 addition & 1 deletion packages/dsw-mailer/dsw/mailer/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
DEFAULT_ENCODING = 'utf-8'
NULL_UUID = '00000000-0000-0000-0000-000000000000'
PROG_NAME = 'dsw-mailer'
VERSION = '4.10.2'
VERSION = '4.10.3'

VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
VAR_WORKDIR_PATH = 'WORKDIR_PATH'
8 changes: 4 additions & 4 deletions packages/dsw-mailer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-mailer'
version = "4.10.2"
version = "4.10.3"
description = 'Worker for sending email notifications'
readme = 'README.md'
keywords = ['email', 'jinja2', 'notification', 'template']
Expand Down Expand Up @@ -33,9 +33,9 @@ dependencies = [
'sentry-sdk',
'tenacity',
# DSW
"dsw-command-queue==4.10.2",
"dsw-config==4.10.2",
"dsw-database==4.10.2",
"dsw-command-queue==4.10.3",
"dsw-config==4.10.3",
"dsw-database==4.10.3",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-models/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

Released for version consistency with other DSW tools.

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -175,3 +179,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
2 changes: 1 addition & 1 deletion packages/dsw-models/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-models'
version = "4.10.2"
version = "4.10.3"
description = 'Library with DSW models and basic IO operations'
readme = 'README.md'
keywords = ['dsw', 'config', 'yaml', 'parser']
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-storage/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.10.3]

Released for version consistency with other DSW tools.

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -242,3 +246,4 @@ Released for version consistency with other DSW tools.
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
4 changes: 2 additions & 2 deletions packages/dsw-storage/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-storage'
version = "4.10.2"
version = "4.10.3"
description = 'Library for managing DSW S3 storage'
readme = 'README.md'
keywords = ['dsw', 's3', 'bucket', 'storage']
Expand All @@ -26,7 +26,7 @@ dependencies = [
'minio',
'tenacity',
# DSW
"dsw-config==4.10.2",
"dsw-config==4.10.3",
]

[project.urls]
Expand Down
7 changes: 7 additions & 0 deletions packages/dsw-tdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]


## [4.10.3]

### Changed

- Updated to newer Docker base image due to vulnerabilities (CVE-2024-45490)[https://nvd.nist.gov/vuln/detail/CVE-2024-45490], (CVE-2024-45491)[https://nvd.nist.gov/vuln/detail/CVE-2024-45491], (CVE-2024-45492)[https://nvd.nist.gov/vuln/detail/CVE-2024-45492]

## [4.10.2]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -468,3 +474,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
[4.10.0]: /../../tree/v4.10.0
[4.10.1]: /../../tree/v4.10.1
[4.10.2]: /../../tree/v4.10.2
[4.10.3]: /../../tree/v4.10.3
4 changes: 2 additions & 2 deletions packages/dsw-tdk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datastewardshipwizard/python-base:4.9.1-3.11-basic as builder
FROM datastewardshipwizard/python-base:4.10.1-3.11-basic as builder

Check warning on line 1 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

WORKDIR /app

Expand All @@ -8,7 +8,7 @@ RUN python -m pip wheel --no-cache-dir --wheel-dir=/app/wheels -r /app/packages/
&& python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-tdk


FROM datastewardshipwizard/python-base:4.9.1-3.11-basic
FROM datastewardshipwizard/python-base:4.10.1-3.11-basic

ENV PATH "/home/user/.local/bin:$PATH"

Check warning on line 13 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 13 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 13 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 13 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 13 in packages/dsw-tdk/Dockerfile

View workflow job for this annotation

GitHub Actions / Docker (dsw-tdk)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Expand Down
2 changes: 1 addition & 1 deletion packages/dsw-tdk/dsw/tdk/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import re

APP = 'dsw-tdk'
VERSION = '4.10.2'
VERSION = '4.10.3'
METAMODEL_VERSION = 14

REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$')
Expand Down
2 changes: 1 addition & 1 deletion packages/dsw-tdk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-tdk'
version = "4.10.2"
version = "4.10.3"
description = 'Data Stewardship Wizard Template Development Toolkit'
readme = 'README.md'
keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']
Expand Down

0 comments on commit 8c10449

Please sign in to comment.