From 4d500e48e880ea7f9a3582324c55c61373a855ea Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 19 Dec 2024 19:44:52 +0000 Subject: [PATCH] Updated base image docker repo url Also fixed some code deprecation warnings Change-Id: I7b65ef5621d54731effbf8545d2af92ac423d3ac --- deckhand/engine/document_validation.py | 5 +++-- images/deckhand/Dockerfile.ubuntu_jammy | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deckhand/engine/document_validation.py b/deckhand/engine/document_validation.py index 9fbbf77b..6f665129 100644 --- a/deckhand/engine/document_validation.py +++ b/deckhand/engine/document_validation.py @@ -15,7 +15,8 @@ import abc import copy import os -import pkg_resources +from importlib.resources import files + import re import yaml @@ -44,7 +45,7 @@ def _get_schema_parts(document, schema_key='schema'): def _get_schema_dir(): - return pkg_resources.resource_filename('deckhand.engine', 'schemas') + return str(files('deckhand.engine') / 'schemas') def _build_schema_map(): diff --git a/images/deckhand/Dockerfile.ubuntu_jammy b/images/deckhand/Dockerfile.ubuntu_jammy index a5b63308..c5204c02 100644 --- a/images/deckhand/Dockerfile.ubuntu_jammy +++ b/images/deckhand/Dockerfile.ubuntu_jammy @@ -18,7 +18,7 @@ # 429 Too Many Requests - Server message: too many requests: # You have reached your pull rate limit. # You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit -ARG FROM=public.ecr.aws/ubuntu/ubuntu:jammy +ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy FROM ${FROM} LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'