-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #84 from ublue-os/ubuntu-upstream
feat: build ubuntu from upstream
- Loading branch information
Showing
3 changed files
with
102 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,12 +29,12 @@ jobs: | |
| - name: Checkout Push to Registry action | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Verify Ubuntu toolbox | ||
| uses: EyeCantCU/cosign-action/[email protected] | ||
| with: | ||
| containers: ubuntu-toolbox:22.04 | ||
| pubkey: https://raw.githubusercontent.com/toolbx-images/images/main/quay.io-toolbx-images.pub | ||
| registry: quay.io/toolbx-images | ||
| # - name: Verify Ubuntu toolbox | ||
| # uses: EyeCantCU/cosign-action/[email protected] | ||
| # with: | ||
| # containers: ubuntu-toolbox:22.04 | ||
| # pubkey: https://raw.githubusercontent.com/toolbx-images/images/main/quay.io-toolbx-images.pub | ||
| # registry: quay.io/toolbx-images | ||
|
|
||
| # Build metadata | ||
| - name: Image Metadata | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,32 @@ | ||
| FROM quay.io/toolbx-images/ubuntu-toolbox:22.04 | ||
| # From https://github.com/toolbx-images/images/tree/main/ubuntu/22.04 | ||
| FROM docker.io/library/ubuntu:24.04 | ||
| # FROM https://hub.docker.com/_/ubuntu | ||
|
|
||
| LABEL com.github.containers.toolbox="true" \ | ||
| usage="This image is meant to be used with the toolbox or distrobox command" \ | ||
| summary="A cloud-native terminal experience powered by Ubuntu" \ | ||
| maintainer="[email protected]" | ||
| name="ubuntu-toolbox" \ | ||
| usage="This image is meant to be used with the toolbox or distrobox command" \ | ||
| summary="A cloud-native terminal experience powered by Ubuntu" \ | ||
| maintainer="[email protected]" | ||
|
|
||
| COPY ./toolboxes/ubuntu-toolbox/packages.ubuntu /toolbox-packages | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get upgrade -y && \ | ||
| RUN rm /etc/apt/apt.conf.d/docker-gzip-indexes /etc/apt/apt.conf.d/docker-no-languages && \ | ||
| sed -Ei 's/^(hosts:.*)(\<files\>)\s*(.*)/\1\2 myhostname \3/' /etc/nsswitch.conf && \ | ||
| sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/local/sbin/unminimize && \ | ||
| apt-get update && \ | ||
| yes | /usr/local/sbin/unminimize && \ | ||
| DEBIAN_FRONTEND=noninteractive apt-get -y install \ | ||
| $(cat toolbox-packages | xargs) && \ | ||
| rm -rd /var/lib/apt/lists/* | ||
|
|
||
| RUN rm /toolbox-packages | ||
|
|
||
| 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 | ||
|
|
||
| RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers | ||
| ubuntu-minimal ubuntu-standard \ | ||
| libnss-myhostname \ | ||
| flatpak-xdg-utils \ | ||
| $(cat toolbox-packages | xargs) && \ | ||
| rm -rd /var/lib/apt/lists/* && \ | ||
| rm /toolbox-packages && \ | ||
| mkdir /usr/share/empty && \ | ||
| userdel --remove ubuntu && \ | ||
| rm /etc/apt/apt.conf.d/20apt-esm-hook.conf && \ | ||
| 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 && \ | ||
| echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters