Skip to content

Commit

Permalink
move to arch base
Browse files Browse the repository at this point in the history
  • Loading branch information
trevnels committed Jan 29, 2024
1 parent b4a259c commit eb84d70
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 18 deletions.
16 changes: 4 additions & 12 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@
FROM ghcr.io/ublue-os/fedora-distrobox:latest
FROM ghcr.io/ublue-os/arch-distrobox:latest

LABEL com.github.containers.toolbox="true" \
usage="This image is meant to be used with the toolbox or distrobox command" \
summary="My personal distrobox development environment"

RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc
RUN sh -c 'echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo'

COPY extra-packages /
RUN dnf -y update --skip-broken && \
grep -v '^#' /extra-packages | xargs dnf -y install
RUN paru -Syu --noconfirm && \
paru -S --needed - < /extra-packages
RUN rm /extra-packages

# change distrobox cache dir to keep distrobox and host fontconfig caches separate
# prevents fonts from breaking between host and container due to changing paths
RUN echo 'export XDG_CACHE_HOME="$HOME/.cache-distrobox"' > /etc/profile.d/cache-home.sh

# install Bun, and keep npm up to date (npm should be present as part of extra-packages above)
RUN npm install -g bun npm typescript typescript-language-server

# install Typst
RUN wget -qO- https://github.com/typst/typst/releases/latest/download/typst-x86_64-unknown-linux-musl.tar.xz | tar -xJ -C /tmp/ && \
mv /tmp/typst-x86_64-unknown-linux-musl/typst /usr/local/bin/ && \
rm -rf /tmp/typst-x86_64-unknown-linux-musl
RUN npm install -g typescript typescript-language-server

RUN ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
Expand Down
13 changes: 7 additions & 6 deletions extra-packages
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
code
dbus-x11
visual-studio-code-bin
dbus
eza
ffmpeg
fzf
gh
golang
golang-x-tools-gopls
github-cli
go
gopls
helix
just
make
neofetch
npm
python3
python
ripgrep
rustup
typst
wl-clipboard
yt-dlp

0 comments on commit eb84d70

Please sign in to comment.