From 0fd06cacd75b884afe5bd2d0e8b118d017499ff4 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Mon, 26 Feb 2024 09:27:12 -0500
Subject: [PATCH 1/2] fix: COPY yq into final image for modules

---
 .github/workflows/tag.yml    | 2 +-
 templates/Containerfile.j2   | 3 ++-
 templates/modules/modules.j2 | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index f1f5400..5314bca 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null
           earthly org s blue-build
-          earthly sat s blue-build
+          earthly sat s blue-build-tag
 
       - name: Set up Python
         uses: actions/setup-python@v5
diff --git a/templates/Containerfile.j2 b/templates/Containerfile.j2
index c2408c8..bf2908e 100644
--- a/templates/Containerfile.j2
+++ b/templates/Containerfile.j2
@@ -46,9 +46,10 @@ ARG CONFIG_DIRECTORY="/tmp/config"
 ARG IMAGE_NAME="{{ recipe.name }}"
 ARG BASE_IMAGE="{{ recipe.base_image }}"
 
+COPY --from=gcr.io/projectsigstore/cosign /ko-app/cosign /usr/bin/cosign
+COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
 {%- include "modules/modules.j2" %}
 
-COPY --from=gcr.io/projectsigstore/cosign /ko-app/cosign /usr/bin/cosign
 COPY --from=ghcr.io/blue-build/cli:
 {%- if let Some(tag) = recipe.blue_build_tag -%}
 {{ tag }}
diff --git a/templates/modules/modules.j2 b/templates/modules/modules.j2
index 26f7233..0ac9af2 100644
--- a/templates/modules/modules.j2
+++ b/templates/modules/modules.j2
@@ -8,7 +8,6 @@
 RUN \
   --mount=type=tmpfs,target=/tmp \
   --mount=type=tmpfs,target=/var \
-  --mount=type=bind,from=docker.io/mikefarah/yq,src=/usr/bin/yq,dst=/usr/bin/yq \
   --mount=type=bind,from=stage-config,src=/config,dst=/tmp/config,rw \
       {%- if let Some(source) = module.source %}
   --mount=type=bind,from={{ source }},src=/modules,dst=/tmp/modules,rw \

From 83c966b5600236d62f2f82671927c7dea94fcdfc Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Mon, 26 Feb 2024 09:28:33 -0500
Subject: [PATCH 2/2] chore: Release blue-build version 0.8.1

---
 CHANGELOG.md | 7 +++++++
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 install.sh   | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbdeff2..abc1651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.8.1] - 2024-02-26
+
+### Bug Fixes
+
+- COPY yq into final image for modules
+
 ## [0.8.0] - 2024-02-25
 
 ### Bug Fixes
@@ -40,6 +46,7 @@ All notable changes to this project will be documented in this file.
 - Add trace log for github cosign verify
 - Fix integration-tests for forks
 - Update default module source (#76)
+- Release blue-build version 0.8.0
 
 ### Refactor
 
diff --git a/Cargo.lock b/Cargo.lock
index 1e3818d..4efb6ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -278,7 +278,7 @@ dependencies = [
 
 [[package]]
 name = "blue-build"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "anyhow",
  "askama",
diff --git a/Cargo.toml b/Cargo.toml
index 56c0bbf..d36fa27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blue-build"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 description = "A CLI tool built for creating Containerfile templates based on the Ublue Community Project"
 repository = "https://github.com/blue-build/cli"
diff --git a/install.sh b/install.sh
index 160af44..5709ecb 100755
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-VERSION=v0.8.0
+VERSION=v0.8.1
 
 # We use sudo for podman so that we can copy directly into /usr/local/bin