Skip to content

Commit

Permalink
fix: Fix libexpat vulnerabilities (update base Docker image)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarekSuchanek
MarekSuchanek committed Sep 9, 2024
1 parent 71a6e0e commit f420332
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions packages/dsw-data-seeder/Dockerfile
View file
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/

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/
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/
Expand Down
4 changes: 2 additions & 2 deletions packages/dsw-document-worker/Dockerfile
View file
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/

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/
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/
Expand Down
4 changes: 2 additions & 2 deletions packages/dsw-mailer/Dockerfile
View file
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/

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/
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/
Expand Down
4 changes: 2 additions & 2 deletions packages/dsw-tdk/Dockerfile
View file
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/

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/

Expand Down

0 comments on commit f420332

Please sign in to comment.