From 52e4d1f5d40277413ef7521ec1d84488e6eef387 Mon Sep 17 00:00:00 2001 From: Chris Marslender Date: Thu, 19 Oct 2023 11:57:04 -0500 Subject: [PATCH] Add yq to the images --- ubuntu-18.04/Dockerfile | 5 +++++ ubuntu-20.04/Dockerfile | 5 +++++ ubuntu-22.04/Dockerfile | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/ubuntu-18.04/Dockerfile b/ubuntu-18.04/Dockerfile index bac30b9..2941d30 100644 --- a/ubuntu-18.04/Dockerfile +++ b/ubuntu-18.04/Dockerfile @@ -1,8 +1,13 @@ +# So we can copy yq into our container later +FROM mikefarah/yq:4 AS yq + FROM ubuntu:18.04 ENV PYENV_ROOT=/root/.pyenv ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH" +COPY --from=yq /usr/bin/yq /usr/bin/yq + RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \ apt-utils \ diff --git a/ubuntu-20.04/Dockerfile b/ubuntu-20.04/Dockerfile index 2c5e6ef..3c809ec 100644 --- a/ubuntu-20.04/Dockerfile +++ b/ubuntu-20.04/Dockerfile @@ -1,9 +1,14 @@ +# So we can copy yq into our container later +FROM mikefarah/yq:4 AS yq + FROM ubuntu:20.04 ENV PYENV_ROOT=/root/.pyenv ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH" ENV LD_LIBRARY_PATH="/usr/lib" +COPY --from=yq /usr/bin/yq /usr/bin/yq + RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \ apt-utils \ diff --git a/ubuntu-22.04/Dockerfile b/ubuntu-22.04/Dockerfile index 800c20b..5a042a1 100644 --- a/ubuntu-22.04/Dockerfile +++ b/ubuntu-22.04/Dockerfile @@ -1,9 +1,14 @@ +# So we can copy yq into our container later +FROM mikefarah/yq:4 AS yq + FROM ubuntu:22.04 ENV PYENV_ROOT=/root/.pyenv ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH" ENV LD_LIBRARY_PATH="/usr/lib" +COPY --from=yq /usr/bin/yq /usr/bin/yq + RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \ apt-utils \