From b915f443e31163951c4b9bd5ae35a7610c25cedc Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Thu, 2 Nov 2023 10:58:07 +1300 Subject: [PATCH] build: Upgrade the cli container to use gdal 3.7.2 (#2986) #### Motivation Upgrade gdal to 3.7.2 to fix the webp CVE #### Modification Upgrade the cli docker container version to 3.7.2 #### Checklist - [ ] Tests updated - [ ] Docs updated - [ ] Issue linked in Title --- packages/cli/Dockerfile | 2 +- packages/cli/src/gdal/gdal.docker.ts | 2 +- packages/cogify/src/cogify/gdal.runner.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/Dockerfile b/packages/cli/Dockerfile index 26a9cfc75..5513245a2 100644 --- a/packages/cli/Dockerfile +++ b/packages/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/osgeo/gdal:ubuntu-small-3.7.0 +FROM ghcr.io/osgeo/gdal:ubuntu-small-3.7.2 ENV NODE_ENV=PRODUCTION diff --git a/packages/cli/src/gdal/gdal.docker.ts b/packages/cli/src/gdal/gdal.docker.ts index 9da2c234d..33b0c306d 100644 --- a/packages/cli/src/gdal/gdal.docker.ts +++ b/packages/cli/src/gdal/gdal.docker.ts @@ -51,7 +51,7 @@ export class GdalDocker extends GdalCommand { /** this could contain sensitive info like AWS access keys */ private async getDockerArgs(): Promise { const DOCKER_CONTAINER = Env.get(Env.Gdal.DockerContainer) ?? 'ghcr.io/osgeo/gdal'; - const DOCKER_CONTAINER_TAG = Env.get(Env.Gdal.DockerContainerTag) ?? 'ubuntu-small-3.7.0'; + const DOCKER_CONTAINER_TAG = Env.get(Env.Gdal.DockerContainerTag) ?? 'ubuntu-small-3.7.2'; const userInfo = os.userInfo(); const credentials = await this.getCredentials(); return [ diff --git a/packages/cogify/src/cogify/gdal.runner.ts b/packages/cogify/src/cogify/gdal.runner.ts index 7b235cd93..2945fe010 100644 --- a/packages/cogify/src/cogify/gdal.runner.ts +++ b/packages/cogify/src/cogify/gdal.runner.ts @@ -15,7 +15,7 @@ export interface GdalCommand { function getDockerContainer(): string { const containerPath = process.env['GDAL_DOCKER_CONTAINER'] ?? 'ghcr.io/osgeo/gdal'; - const tag = process.env['GDAL_DOCKER_CONTAINER_TAG'] ?? 'ubuntu-small-3.7.0'; + const tag = process.env['GDAL_DOCKER_CONTAINER_TAG'] ?? 'ubuntu-small-3.7.2'; return `${containerPath}:${tag}`; }