This repository has been archived by the owner on Apr 28, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: update arch toolbox, update ubuntu toolbox with upstream
- Loading branch information
1 parent
ab8bbcf
commit 1d1ea8d
Showing
4 changed files
with
97 additions
and
62 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
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
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,33 +1,37 @@ | ||
| 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 | ||
|
|
||
| COPY ./toolboxes/ubuntu-toolbox/basic.ubuntu /toolbox-packages | ||
|
|
||
| # Installs basic packages listed in the basic.ubuntu file | ||
| # Then installs dev related packages and others | ||
| 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) && \ | ||
| ubuntu-minimal ubuntu-standard \ | ||
| libnss-myhostname \ | ||
| flatpak-xdg-utils \ | ||
| $(cat toolbox-packages | xargs) && \ | ||
| wget https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg \ | ||
| -O /usr/share/keyrings/vscodium-archive-keyring.asc && \ | ||
| echo 'deb [ signed-by=/usr/share/keyrings/vscodium-archive-keyring.asc ] https://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs vscodium main' \ | ||
| | sudo tee /etc/apt/sources.list.d/vscodium.list && \ | ||
| apt-get update && apt-get upgrade -y && \ | ||
| DEBIAN_FRONTEND=noninteractive apt-get -y install \ | ||
| codium \ | ||
| cargo \ | ||
| adb \ | ||
| fastboot && \ | ||
| rm -rd /var/lib/apt/lists/* | ||
|
|
||
| COPY ./toolboxes/ubuntu-toolbox/files / | ||
|
|
||
| RUN rm /toolbox-packages | ||
|
|
||
| RUN ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/git && \ | ||
| 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 | ||
| 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