Skip to content

Commit

Permalink
fix: ➕ Updated to install cosign from package
Browse files Browse the repository at this point in the history
  • Loading branch information
ironman820 committed Mar 10, 2023
1 parent 741b386 commit f863fdd
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- '**.md'
- '**.txt'
env:
IMAGE_BASE_NAME: ironman-ublue
IMAGE_BASE_NAME: ironman-ubuntu
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

jobs:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cosign.key
18 changes: 8 additions & 10 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ LABEL com.github.containers.toolbox="true" \
summary="Base image for creating Ubuntu toolbox containers" \
maintainer="Ievgen Popovych <[email protected]>"

# Remove apt configuration optimized for containers
# Remove docker-gzip-indexes to help with "command-not-found"
RUN rm /etc/apt/apt.conf.d/docker-gzip-indexes /etc/apt/apt.conf.d/docker-no-languages

# Enable myhostname nss plugin for clean hostname resolution without patching
# hosts (at least for sudo), add it right after 'files' entry. We expect that
# this entry is not present yet. Do this early so that package postinst (which
Expand All @@ -33,18 +29,20 @@ RUN sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/local/sbin/unminimize && \
install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg && \
sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list' && \
rm -f packages.microsoft.gpg && \
wget https://github.com/sigstore/cosign/releases/download/v2.0.0/cosign_2.0.0_amd64.deb -O /root/cosign.deb && \
dpkg -i /root/cosign.deb && \
rm -f /root/cosign.deb && \
DEBIAN_FRONTEND=noninteractive apt -y install apt-transport-https && \
apt update && \
DEBIAN_FRONTEND=noninteractive apt install -y code && \
rm -rd /var/lib/apt/lists/*
RUN rm /extra-packages

# Fix empty bind-mount to clear selinuxfs (see #337)
RUN mkdir /usr/share/empty
# RUN mkdir /usr/share/empty

# Add flatpak-spawn to /usr/bin
RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/ && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree
RUN ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree
4 changes: 4 additions & 0 deletions cosign.pub
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELfEsLtL1HeynHy0jGblEIZTycMl6
Z0sUhBJ9PlfJU/bHUoFn/ZmdaefHv0ZtsriyzY1eET7eF6izQYZ6IS5BJg==
-----END PUBLIC KEY-----
1 change: 0 additions & 1 deletion extra-packages
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ zip
curl
flatpak-xdg-utils
btop
cosign
ffmpeg
duf
bat
Expand Down

0 comments on commit f863fdd

Please sign in to comment.