Skip to content

Commit

Permalink
build: Upgrade the cli container to use gdal 3.7.2 (#2986)
Browse files Browse the repository at this point in the history
#### 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
  • Loading branch information
Wentao-Kuang authored Nov 1, 2023
1 parent 615334f commit b915f44
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/gdal/gdal.docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class GdalDocker extends GdalCommand {
/** this could contain sensitive info like AWS access keys */
private async getDockerArgs(): Promise<string[]> {
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 [
Expand Down
2 changes: 1 addition & 1 deletion packages/cogify/src/cogify/gdal.runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
}

Expand Down

0 comments on commit b915f44

Please sign in to comment.