From e90b1be650f6546e188dc458f5a45836bc7f1c43 Mon Sep 17 00:00:00 2001 From: JonZeolla Date: Thu, 15 Feb 2024 16:17:38 -0500 Subject: [PATCH] feat: Default to ubuntu 22.04 with Python 3.12 (#109) --- cookiecutter.json | 4 ++-- .../Dockerfile" | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index 5e6ecd6b..3ed82ea7 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -3,8 +3,8 @@ "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_').replace('-', '_') }}", "project_short_description": "TODO", "project_owner_github_username": "jonzeolla", - "python_version": ["3.12", "3.11", "3.10", "3.9"], - "docker_base": ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:23.04"], + "python_version": ["3.12", "3.11"], + "docker_base": ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:23.04"], "dockerhub": ["no", "yes"], "versioning": ["CalVer", "SemVer-ish"], "public": ["no", "yes"], diff --git "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/Dockerfile" "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/Dockerfile" index 5ff7b16b..e31347b3 100644 --- "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/Dockerfile" +++ "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/Dockerfile" @@ -21,9 +21,12 @@ LABEL org.opencontainers.image.source="https://github.com/SeisoLLC/{{ cookiecutt LABEL org.opencontainers.image.revision="${COMMIT_HASH}" LABEL org.opencontainers.image.licenses="{{ cookiecutter.license }}" +# Set noninteractive as an arg so it's only available at build time +ARG DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008,DL3013 RUN apt-get update \ && apt-get install -y --no-install-recommends software-properties-common \ + gpg-agent \ && add-apt-repository ppa:deadsnakes/ppa \ && apt-get install -y --no-install-recommends python{{ cookiecutter.python_version }} \ python{{ cookiecutter.python_version }}-venv \