Skip to content

Commit

Permalink
Merge pull request #59 from ublue-os/match-melange-sdk
Browse files Browse the repository at this point in the history
feat(wolfi-dx-toolbox): Install latest utilities, match melange SDK a…
  • Loading branch information
EyeCantCU authored Feb 11, 2024
2 parents f1502e2 + 07915a9 commit 64b933e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build-wolfi-toolbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ jobs:
labels: |
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/boxkit/main/README.md
# Maximize build space for DX
- name: Maximize build space
uses: ublue-os/remove-unwanted-software@v6
if: matrix.image_name == 'wolfi-dx-toolbox'

# Build image using Buildah action
- name: Build Image
id: build_image
Expand Down
26 changes: 26 additions & 0 deletions toolboxes/wolfi-toolbox/Containerfile.wolfi
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,32 @@ RUN grep -v '^#' /tmp/packages.wolfi | xargs apk add && \
grep -v '^#' /tmp/packages.wolfi-dx | xargs apk add \
; fi

# DX: Include utilities available in the melange SDK
RUN if [[ "${IMAGE_NAME}" =~ "dx" ]]; then \
cd /tmp && \
export PATH="/tmp/go/bin:${PATH}" && \
# go setup
export GOPATH="/tmp/go" && \
mkdir -p "${GOPATH}" && \
# goimports
go install golang.org/x/tools/cmd/goimports@latest && \
mkdir -p "/usr/bin" && \
mv "${GOPATH}/bin/goimports" "/usr/bin" && \
# melange
git clone https://github.com/chainguard-dev/melange.git && \
(cd melange && make melange install) && \
# apko
git clone https://github.com/chainguard-dev/apko.git && \
(cd apko && make apko install) && \
# wolfictl
git clone https://github.com/wolfi-dev/wolfictl.git && \
(cd wolfictl && make wolfictl install) && \
# yam
git clone https://github.com/chainguard-dev/yam.git && \
cd yam && \
go build -v -o "/usr/bin/yam" . \
; fi

# Get Distrobox-host-exec and host-spawn
RUN git clone https://github.com/89luca89/distrobox.git --single-branch /tmp/distrobox && \
cp /tmp/distrobox/distrobox-host-exec /usr/bin/distrobox-host-exec && \
Expand Down

0 comments on commit 64b933e

Please sign in to comment.