Merge pull request #49 from Chia-Network/add-yq

Chia-Network · Oct 19, 2023 · 410db62 · 410db62
2 parents 4b26c7d + 52e4d1f
commit 410db62
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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 \