Compare commits

..

67 Commits

Author SHA1 Message Date
Job79 d74c7565bd fix: hide podman pull errors
Build container / build (push) Failing after 5m11s
2024-12-22 15:02:19 +01:00
Job79 a69e237bd6 fix: change directory locations 2024-12-21 20:31:15 +01:00
Job79 9cca35a969 ci: use podman instead of docker for container builds
Build container / build (push) Successful in 9m11s
2024-12-21 11:54:15 +01:00
Job79 b93b0bd735 fix: update nvim config
Container build / container-build (push) Successful in 4m12s
2024-12-20 20:24:46 +01:00
Job79 b745a06eec fix: add lazygit 2024-12-20 20:24:29 +01:00
Job79 9fbc411dab feat(Containerfile): add chafa for image previews
Container build / container-build (push) Successful in 3m48s
2024-12-19 20:02:46 +01:00
Job79 ece5e86a16 feat(bashrc): setup fzf shell integration
Container build / container-build (push) Successful in 5m16s
2024-12-19 19:54:53 +01:00
Job79 065eeedce2 fix(enter.sh): disable podman --detach-keys to fix control + p in neovim
Container build / container-build (push) Has been cancelled
2024-12-19 19:53:14 +01:00
Job79 8f4c57d178 ci: use nexus runner
Container build / container-build (push) Successful in 5m15s
2024-12-19 19:24:01 +01:00
Job79 09af0db185 feat: update nvim config
Container build / container-build (push) Failing after 1m21s
2024-12-19 19:22:24 +01:00
Job79 9d90ea60f2 ci: switch runner to dynamis2
Container build / container-build (push) Failing after 1m54s
2024-12-16 19:08:57 +01:00
Job79 790c7c722c ci: switch to nexus runner
Container build / container-build (push) Successful in 5m21s
2024-12-16 18:42:42 +01:00
Job79 35c4f7ed8f ci: switch to dynamis runner
Container build / container-build (push) Has been cancelled
2024-12-15 18:10:03 +01:00
Job79 8c981a8e8d ci: switch to laptop-vm
Container build / container-build (push) Has been cancelled
2024-12-14 11:02:29 +01:00
Job79 f7da637a1c ci: switch to laptop
Container build / container-build (push) Successful in 4m54s
2024-12-14 10:36:04 +01:00
Job79 f6bd18cf7d fix: add lsp and lazy config
Container build / container-build (push) Successful in 3m22s
2024-12-13 20:22:27 +01:00
Job79 50fc142407 fix: always fetch when image is set 2024-12-13 20:22:11 +01:00
Job79 2d7807ea60 fix: include whole nvim plugin config dir 2024-12-13 20:21:57 +01:00
Job79 5fc464aa6d fix: make /run/user/1000 writable 2024-12-13 20:21:46 +01:00
Job79 3560f348a7 feat: fix container recreate
Container build / container-build (push) Successful in 3m21s
2024-12-13 19:38:03 +01:00
Job79 a0b65c856d feat: add options file 2024-12-13 19:34:16 +01:00
Job79 393e49c781 chore: update config to lazyvim 14 2024-12-13 19:33:52 +01:00
Job79 9bed5b823f chore: update copilot LazyExtra name
Container build / container-build (push) Successful in 3m31s
2024-12-12 21:12:03 +01:00
Job79 641d1c3050 feat: add fancy logging 2024-12-12 21:10:35 +01:00
Job79 e180de3a7b refactor: cleanup config
Container build / container-build (push) Successful in 4m52s
2024-12-12 20:42:39 +01:00
Job79 7fdb0e0fc0 revert: ci: switch to runner-01-x86_64 runner
Container build / container-build (push) Successful in 4m47s
This reverts commit 420d4a287a.
2024-12-08 12:59:41 +01:00
Job79 0c76caa267 fix: escape terminal keymap
Container build / container-build (push) Failing after 1m6s
2024-12-01 11:37:00 +01:00
Job79 420d4a287a ci: switch to runner-01-x86_64 runner
Container build / container-build (push) Failing after 1m16s
2024-11-24 12:20:52 +01:00
Job79 5bc72a6fb3 fix: disable snacks dashboard
Container build / container-build (push) Successful in 3m29s
2024-11-24 10:34:24 +01:00
Job79 a1332e1f69 chore: update to lazyvim 13
Container build / container-build (push) Successful in 5m3s
2024-11-08 18:52:27 +01:00
Job79 d545a9cdf0 fix: remove typo in escape macro
Container build / container-build (push) Successful in 3m20s
2024-11-08 18:38:00 +01:00
Job79 fedeb5d58d feat: update colorscheme
Container build / container-build (push) Successful in 6m0s
2024-11-07 19:21:27 +01:00
Job79 fc68b611fe feat: add some custom keymaps
Container build / container-build (push) Successful in 3m28s
2024-11-06 20:07:24 +01:00
Job79 702687276a feat: only show important notifications
Container build / container-build (push) Successful in 3m26s
2024-11-01 20:37:52 +01:00
Job79 b11b9fd153 docs: add comments to config 2024-11-01 20:37:32 +01:00
Job79 5868d34775 refactor: move .dev directory
Container build / container-build (push) Successful in 5m16s
2024-10-26 15:45:28 +02:00
Job79 6fffe4e0a0 feat: add gruvbox 2024-10-26 15:45:02 +02:00
Job79 ee6ffcd31a feat: disable type hints
Container build / container-build (push) Successful in 3m14s
2024-10-19 12:19:05 +02:00
Job79 4c454ed3ef feat: install tailwind lazyextra 2024-10-19 12:18:50 +02:00
Job79 4a9e54b8b3 ci: set label to plabble-sprinter 2024-10-19 12:18:30 +02:00
Job79 9498c36701 ci: test dynamis2
Container build / container-build (push) Has been cancelled
2024-10-17 19:54:07 +02:00
Job79 8d2948dcef feat: add lazyvim plugins
Container build / container-build (push) Successful in 3m46s
2024-10-14 20:07:29 +02:00
Job79 1bad1c00eb fix: permission of config files 2024-10-14 20:06:29 +02:00
Job79 b6b9fc4f6b ci: switch to plabble action runner
Container build / container-build (push) Successful in 5m30s
2024-10-14 19:35:07 +02:00
Job79 a8ee5a8ee1 build(Containerfile): switch to quay image
Container build / container-build (push) Failing after 1m54s
2024-10-14 19:32:57 +02:00
Job79 ad2f27b8a8 ci: run on dynamis
Container build / container-build (push) Failing after 1m3s
2024-10-14 19:19:41 +02:00
Job79 d97a76499f fix: give container access to host networking
Container build / container-build (push) Successful in 3m54s
2024-10-09 16:23:09 +02:00
Job79 80995c560f fix(enter): use host networking
Container build / container-build (push) Successful in 3m50s
2024-10-06 14:53:37 +02:00
Job79 89dbfcb996 feat: add container update message
Container build / container-build (push) Successful in 3m58s
2024-09-29 16:52:32 +02:00
Job79 a67ea6c795 feat: disable autocomplete with the enter key
Container build / container-build (push) Has been cancelled
2024-09-29 16:49:15 +02:00
Job79 63ac1aae83 feat: handle automatically updates with enter.sh 2024-09-29 16:48:50 +02:00
Job79 df8b7b5bfe feat: add bash_profile for creating copilot directory 2024-09-29 16:48:19 +02:00
Job79 53cfeb1a62 feat: update container on build
Container build / container-build (push) Successful in 3m21s
2024-09-29 11:31:49 +02:00
Job79 562b26b96a ci: build the container weekly 2024-09-29 11:31:47 +02:00
Job79 7465b394f4 feat: keep cache in a volume 2024-09-29 11:29:40 +02:00
Job79 2e49a4f3a3 feat: move to gitea container
Container build / container-build (push) Successful in 2m56s
2024-09-28 20:09:34 +02:00
Job79 755605b2fb fix: move copilot credentials to volume
Container build / container-build (push) Successful in 2m33s
2024-09-28 20:05:30 +02:00
Job79 5c7db03b32 ci: attempt to get cache working
Container build / container-build (push) Has been cancelled
2024-09-28 19:59:48 +02:00
Job79 8c13f219b5 fix: attempt to fix ci errors
Container build / container-build (push) Successful in 3m10s
2024-09-28 19:30:29 +02:00
Job79 6556db0ce6 ci: update docker/build-push-action to v6
Container build / container-build (push) Failing after 1m1s
2024-09-28 19:17:56 +02:00
Job79 0e51472973 ci: add container build
Container build / container-build (push) Successful in 3m56s
2024-09-28 18:01:04 +02:00
Job79 54865b536a feat: make container updates easier 2024-09-28 17:56:33 +02:00
Job79 7a63471603 chore: switch to rosepine themed PS1 2024-09-24 19:24:59 +02:00
Job79 9a20313beb feat: update config 2024-09-24 19:24:17 +02:00
Job79 5e3d7ca7fb feat: switch to lazyvim 2024-09-23 19:56:52 +02:00
Job79 17e3a6840f feat: switch to neovim 2024-09-17 18:32:24 +00:00
Job79 c510c7f919 init 2024-03-30 20:41:55 +01:00
25 changed files with 271 additions and 302 deletions
-115
View File
@@ -1,115 +0,0 @@
name: Build containers
on:
workflow_dispatch:
push:
branches: ["main"]
paths: ["containers/**", ".gitea/workflows/build.yaml"]
pull_request:
branches: ["main"]
paths: ["containers/**", ".gitea/workflows/build.yaml"]
schedule:
- cron: "0 16 * * FRI"
jobs:
changes:
runs-on: job-v2
outputs:
base: ${{ steps.filter.outputs.base == 'true' }}
infra: ${{ steps.filter.outputs.infra == 'true' || steps.filter.outputs.base == 'true' }}
go: ${{ steps.filter.outputs.go == 'true' || steps.filter.outputs.base == 'true' }}
php: ${{ steps.filter.outputs.php == 'true' || steps.filter.outputs.base == 'true' }}
any_change: ${{ steps.filter.outputs.workflow == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}}
steps:
- uses: actions/checkout@v4
- uses: https://github.com/dorny/paths-filter@v3
id: filter
with:
filters: |
workflow: ['.gitea/workflows/build.yaml']
base: ['containers/base/**']
infra: ['containers/infra/**']
go: ['containers/go/**']
php: ['containers/php/**']
base-image:
needs: [changes]
if: ${{ needs.changes.outputs.base == 'true' || needs.changes.outputs.any_change == 'true' }}
runs-on: job-v2
steps:
- uses: actions/checkout@v4
- name: Log in
uses: redhat-actions/podman-login@v1
with:
registry: git.plabble.org
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_TOKEN }}
- name: Build
id: build
uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
with:
image: job79/base
tags: ${{ github.ref_name }}
context: ./containers/base
containerfiles: ./containers/base/Containerfile
platforms: linux/amd64
- name: Push
uses: redhat-actions/push-to-registry@v2
with:
image: ${{ steps.build.outputs.image }}
tags: ${{ steps.build.outputs.tags }}
registry: git.plabble.org
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_TOKEN }}
extra-args: |
--compression-format=zstd
--compression-level=12
dependent-images:
needs: [changes, base-image]
if: always() && needs.changes.result == 'success' && (needs.base-image.result == 'success' || needs.base-image.result == 'skipped')
runs-on: job-v2
strategy:
fail-fast: false
matrix:
container: [infra, go, php]
steps:
- name: Check if build needed
id: check
run: |
if [[ "${{ matrix.container }}" == "infra" && "${{ needs.changes.outputs.infra }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
if [[ "${{ matrix.container }}" == "go" && "${{ needs.changes.outputs.go }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
if [[ "${{ matrix.container }}" == "php" && "${{ needs.changes.outputs.php }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
if [[ "${{ needs.changes.outputs.any_change }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
- name: Clone repo
if: steps.check.outputs.run == 'true'
uses: actions/checkout@v4
- name: Log in
if: steps.check.outputs.run == 'true'
uses: redhat-actions/podman-login@v1
with:
registry: git.plabble.org
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_TOKEN }}
- name: Build
id: build
if: steps.check.outputs.run == 'true'
uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
with:
image: job79/${{ matrix.container }}
tags: ${{ github.ref_name }}
context: ./containers/${{ matrix.container }}
containerfiles: ./containers/${{ matrix.container }}/Containerfile
build-args: TAG=${{ github.ref_name }}
platforms: linux/amd64
- name: Push
if: steps.check.outputs.run == 'true'
uses: redhat-actions/push-to-registry@v2
with:
image: ${{ steps.build.outputs.image }}
tags: ${{ steps.build.outputs.tags }}
registry: git.plabble.org
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_TOKEN }}
extra-args: |
--compression-format=zstd
--compression-level=12
+27
View File
@@ -0,0 +1,27 @@
name: Build container
on:
push:
schedule:
- cron: '0 16 * * FRI'
jobs:
build:
runs-on: rocky-minimal
steps:
- uses: actions/checkout@v4
- name: Build
uses: redhat-actions/buildah-build@v2
with:
image: ${{ github.actor }}/${{ github.event.repository.name }}
tags: latest
containerfiles: |
./Containerfile
- name: Push
uses: redhat-actions/push-to-registry@v2
with:
image: ${{ github.actor }}/${{ github.event.repository.name }}
tags: latest
extra-args: --compression-format zstd:chunked
registry: git.plabble.org
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_TOKEN }}
+31
View File
@@ -0,0 +1,31 @@
# ========================================= #
# Containerfile v1.0; job79 #
# Configure and setup a neovim devcontainer #
# for go and nodejs development. #
# ========================================= #
FROM quay.io/fedora/fedora:41
# === setup system ===
RUN dnf update -y && \
dnf copr enable -y atim/lazygit && \
dnf -y install neovim unzip \
bash-completion zoxide fd-find chafa lazygit procps \
git go npm
# === setup container user ===
RUN useradd -ms /bin/bash user && usermod -aG wheel user && sed -i '/NOPASSWD/s/^#//g' /etc/sudoers
RUN mkdir /run/user/1000 && chown user:user /run/user/1000
USER user
WORKDIR /home/user
COPY config/user/bashrc /home/user/.bashrc
COPY config/user/profile /home/user/.bash_profile
# === setup neovim ===
RUN git clone --depth 1 https://github.com/LazyVim/starter ~/.config/nvim
COPY --chown=user:user config/nvim/plugins /home/user/.config/nvim/lua/plugins
COPY --chown=user:user config/nvim/config /home/user/.config/nvim/lua/config
COPY --chown=user:user config/nvim/lazyvim.json /home/user/.config/nvim/lazyvim.json
# === setup container ===
ENV TZ="Europe/Amsterdam"
VOLUME /home/user/.local /home/user/.cache
+16
View File
@@ -0,0 +1,16 @@
-- Configure custom keymaps.
local keymap = vim.keymap.set
local delkeymap = vim.keymap.del
local opts = { noremap = true, silent = true }
-- Improved line start/end
keymap({ "n", "v" }, "H", "^", opts)
keymap({ "n", "v" }, "L", "$", opts)
-- Improved escape
keymap("n", "<ESC>", "<ESC>:noh<CR>", opts)
keymap("t", "<ESC><ESC>", "<C-\\><C-n>", opts)
-- Disable alt j/k to move lines (conflict with default vim motions)
delkeymap({ "i", "v" }, "<A-j>")
delkeymap({ "i", "v" }, "<A-k>")
+43
View File
@@ -0,0 +1,43 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ "\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
os.exit(1)
end
end
vim.opt.rtp:prepend(lazypath)
require("lazy").setup({
spec = {
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
{ import = "plugins" },
},
defaults = {
lazy = false,
version = false,
},
install = {},
checker = {
enabled = true,
notify = true,
},
performance = {
rtp = {
disabled_plugins = {
"gzip",
"netrwPlugin",
"tarPlugin",
"tohtml",
"tutor",
"zipPlugin",
},
},
},
})
+15
View File
@@ -0,0 +1,15 @@
-- Set some custom options.
local opt = vim.o
local global = vim.g
-- Set target text width for gww to 60.
opt.tw = 60
-- Use the internal clipboard.
opt.clipboard = ""
-- Use original gruvbox theme.
global.gruvbox_material_foreground = "original"
-- Disable snack animations.
global.snacks_animate = false
+12
View File
@@ -0,0 +1,12 @@
{
"extras": [
"lazyvim.plugins.extras.ai.copilot",
"lazyvim.plugins.extras.dap.core",
"lazyvim.plugins.extras.lang.go",
"lazyvim.plugins.extras.lang.svelte",
"lazyvim.plugins.extras.lang.tailwind",
"lazyvim.plugins.extras.lang.typescript",
"lazyvim.plugins.extras.test.core"
],
"version": 7
}
+9
View File
@@ -0,0 +1,9 @@
-- Configure rose-pine and gruvbox-material colorschemes.
return {
{ "rose-pine/neovim", name = "rose-pine" },
{ "sainnhe/gruvbox-material" },
{
"LazyVim/LazyVim",
opts = { colorscheme = "gruvbox-material" },
},
}
+25
View File
@@ -0,0 +1,25 @@
-- Disable unused plugins and functionality.
return {
{
-- Disable the dashboard.
"folke/snacks.nvim",
opts = {
dashboard = { enabled = false },
notifier = { level = vim.log.levels.WARN },
},
},
{
-- Disable inline hints by default.
"neovim/nvim-lspconfig",
opts = {
inlay_hints = { enabled = false },
},
},
-- Disable unused plugins.
{ "folke/flash.nvim", enabled = false },
{ "folke/todo-comments.nvim", enabled = false },
{ "folke/trouble.nvim", enabled = false },
{ "MagicDuck/grug-far.nvim", enabled = false },
{ "akinsho/bufferline.nvim", enabled = false },
}
+14
View File
@@ -0,0 +1,14 @@
. /etc/bashrc
# === environment ===
export EDITOR=nvim \
WAYLAND_DISPLAY=wayland-0 \
XDG_RUNTIME_DIR=/run/user/1000 \
SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock \
PS1='\[\e[30;46m\] container | \w \[\e[0;36m\]\[\e[m\] '
# === aliases and functions ===
alias vi=nvim
post() { curl -sF "content=<-" "https://paste.plabble.org/$2?lang=$1" && echo; }
eval "$(zoxide init --cmd cd bash)"
eval "$(fzf --bash)"
+7
View File
@@ -0,0 +1,7 @@
. ~/.bashrc
# === persist copilot auth files inside .local volume ===
if [ ! -d ~/.config/github-copilot ]; then
mkdir -p ~/.local/share/github-copilot
ln -s ~/.local/share/github-copilot ~/.config
fi
-32
View File
@@ -1,32 +0,0 @@
FROM quay.io/fedora/fedora:44
# === install system packages ===
RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
dnf update -y && \
dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install \
bash-completion git-core fzf curl awk jq fd-find rg unzip which \
host-spawn wl-copy gcc
RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | jq -r .tag_name | sed 's/^v//') && \
curl -sL "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_linux_x86_64.tar.gz" | tar xz -C /usr/local/bin lazygit && \
curl -sL "https://github.com/jorgerojas26/lazysql/releases/latest/download/lazysql_Linux_x86_64.tar.gz" | tar xz -C /usr/local/bin lazysql && \
curl -sL "https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz" | tar xz -C /usr/local --strip-components=1
COPY config/bin /usr/local/bin
# === setup user ===
RUN useradd -ms /bin/bash user && \
echo 'user ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/user && \
mkdir -p /run/user/1000 && \
chown user:user /run/user/1000
USER user
WORKDIR /home/user
RUN mkdir -p .config .local .cache && \
git clone https://git.plabble.org/Job79/neovim-config.git .config/nvim
COPY --chown=user:user config/bashrc .bashrc
COPY --chown=user:user config/git .config/git/config
VOLUME /home/user
-21
View File
@@ -1,21 +0,0 @@
source /etc/bashrc
# === bash settings ===
set -o vi
bind -m vi-insert '"\C-l": clear-screen'
# === environment ===
export PS1="\[\e[30;46m\] \h | \w \[\e[0;36m\]\[\e[m\] " \
EDITOR="nvim" \
WAYLAND_DISPLAY="wayland-0" \
XDG_RUNTIME_DIR="/run/user/1000" \
SSH_AUTH_SOCK="/run/user/1000/ssh-auth-sock" \
TZ="Europe/Amsterdam" \
FZF_CTRL_T_COMMAND="fd --type f --hidden --exclude .git --exclude Library --exclude .cache" \
FZF_ALT_C_COMMAND="fd --type d --hidden --exclude .git --exclude Library --exclude .cache"
# === aliases and functions ===
alias vi=nvim
post() { curl -sF "content=<-" "https://paste.plabble.org/$2?lang=$1" && echo; }
eval "$(fzf --bash)"
-6
View File
@@ -1,6 +0,0 @@
#!/bin/bash
export DBUS_SESSION_BUS_ADDRESS="unix:path=/tmp/bus"
cmd="${0##*/}"
[[ "$cmd" == "host" ]] && unset cmd
exec host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" ${cmd:+"$cmd"} "$@"
-1
View File
@@ -1 +0,0 @@
host
-1
View File
@@ -1 +0,0 @@
host
-12
View File
@@ -1,12 +0,0 @@
[user]
email = job@plabble.org
name = Job79
signingKey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPsqM6ABAaCTQZ+llFXD3CXrYYuIHDEnvz8IBbXddYEc job@plabble.org
[gpg]
format = ssh
[commit]
gpgSign = true
[push]
autoSetupRemote = true
[init]
defaultBranch = main
-10
View File
@@ -1,10 +0,0 @@
ARG TAG
FROM job79/base:${TAG}
USER root
RUN GO_VERSION=$(curl -sL "https://go.dev/VERSION?m=text" | head -n 1 | tr -d '\r\n') && \
curl -sL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" | tar xz -C /usr/local && \
ln -sf /usr/local/go/bin/go /usr/local/bin/go && \
ln -sf /usr/local/go/bin/gofmt /usr/local/bin/gofmt
USER user
-2
View File
@@ -1,2 +0,0 @@
#!/bin/bash
run_opts+=("-v" "$HOME/Documents/go:/home/user/Documents/go")
-11
View File
@@ -1,11 +0,0 @@
ARG TAG
FROM job79/base:${TAG}
USER root
RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install \
just kubectl k9s openssl age "$(curl -s https://api.github.com/repos/getsops/sops/releases/latest | jq -r ".assets[] | select(.name | test(\"sops-.*.$(arch).rpm\$\")) | .browser_download_url")" && \
curl -sL https://talos.dev/install | sh && \
curl -s https://fluxcd.io/install.sh | bash
USER user
-2
View File
@@ -1,2 +0,0 @@
#!/bin/bash
run_opts+=("-v" "$HOME/Documents/infra:/home/user/Documents/infra")
-9
View File
@@ -1,9 +0,0 @@
ARG TAG
FROM job79/base:${TAG}
USER root
RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
dnf -y --setopt=keepcache=1 install php composer npm && \
composer global require laravel/installer
USER user
-2
View File
@@ -1,2 +0,0 @@
#!/bin/bash
run_opts+=("-v" "$HOME/Documents/php:/home/user/Documents/php")
-78
View File
@@ -1,78 +0,0 @@
#!/bin/bash
# =============================================== #
# devc.sh v2.1; job79, maurice #
# Dev container entry script. #
# =============================================== #
set -euo pipefail
log() { echo -e "\e[36m○\e[0m $1"; }
die() { echo -e "\e[31mx\e[0m $1" && exit 1; }
# default_args configures standard container options.
default_args() {
run_opts+=(
"--name" "$name"
"--hostname" "$name"
"--pull=newer" # Update image.
"--userns=keep-id" # Map host user.
"-v" "$name:/home/user:copy" # Persistent home volume.
"-v" "dnf-cache:/var/cache/libdnf5" # Cache dnf metadata.
)
# Unix sockets require SELinux label disable.
[[ -d /sys/fs/selinux ]] && run_opts+=("--security-opt" "label=disable")
# Desktop integration (Wayland, SSH).
[[ -e "/run/user/$UID/wayland-0" ]] && run_opts+=("-v" "/run/user/$UID/wayland-0:/run/user/1000/wayland-0")
[[ -e "${SSH_AUTH_SOCK:-}" ]] && run_opts+=("-v" "$SSH_AUTH_SOCK:/run/user/1000/ssh-auth-sock")
# Load custom container config.
local config_file="${BASH_SOURCE[0]%/*}/containers/$name/config.sh"
[[ -f "$config_file" ]] && source "$config_file" || true
}
# param_args parses CLI arguments into podman run options.
param_args() {
while (($# > 0)); do
case "$1" in
-gpu) run_opts+=("--device" "/dev/dri") ;;
-host-spawn) run_opts+=("-v" "/run/user/$UID/bus:/tmp/bus" "-e" "HOST_HOME=$HOME") ;;
-container-sock) run_opts+=("-v" "$XDG_RUNTIME_DIR/podman/podman.sock:/var/run/docker.sock") ;;
-x11) run_opts+=("-v" "/tmp/.X11-unix:/tmp/.X11-unix" "-v" "$XAUTHORITY:/run/user/1000/.Xauthority:ro" "-e" "DISPLAY=$DISPLAY" "-e" "XAUTHORITY=/run/user/1000/.Xauthority") ;;
-mnt) shift && run_opts+=("-w" "/mnt/" "-v" "$1:/mnt/$([[ -d "$1" ]] || echo "file")") ;;
*) run_opts+=("$1") ;;
esac
shift
done
}
main() {
local state_file="$HOME/.local/share/devc-previous-container"
local image="${1:-}"
# Resolve container name (CLI arg > Last used > Error).
if [[ $image && $image != -* ]]; then
shift
[[ $image != *:* ]] && image+=":main"
echo "$image" >"$state_file"
elif [[ -f $state_file ]]; then
image=$(<$state_file)
else
die "no container name specified"
fi
local name="${image%:*}"
# Start/Restart if not running or if arguments change configuration.
if [[ -z "$(podman ps -q -f name="^$name$" -f status=running)" ]] || (($# > 0)); then
log "starting $image..."
default_args
param_args "$@"
[[ -n "${DEVC_REGISTRY:-}" ]] || die "registry unknown; set the DEVC_REGISTRY environment variable"
podman run --replace --stop-timeout 0 -td "${run_opts[@]}" "$DEVC_REGISTRY/$image"
fi
exec podman exec --detach-keys "ctrl-@,ctrl-@" -it "$name" ${DEVC_COMMAND:-bash -l}
}
main "$@"
Executable
+72
View File
@@ -0,0 +1,72 @@
#!/bin/sh
# =============================================== #
# enter.sh v1.0; job79 #
# Enter into an existing or new dev container and #
# automatically handle dev container updates. #
# =============================================== #
set -eu
log() { printf '\e[%sm%s\e[0m %s\n' "${3:-36}" "${2:-}" "$1"; }
arg() { echo -n " $@"; }
# run_args returns the arguments required for the podman run
# command.
run_args() {
arg "--name $name"
# Disable some security settings to make it possible to
# mount host directories without problems.
arg "--security-opt label=disable" # disable labeling so mounts don't need to be labeled.
arg "--userns=keep-id" # required for ~/.ssh which is usually 700.
# Use host networking.
arg "--net=host"
# Mount the wayland socket. Required to get the system
# clipbard (wl-copy) working.
[ -e "/run/user/$UID/wayland-0" ] && arg "-v /run/user/$UID/wayland-0:/run/user/1000/wayland-0"
# Mount the ssh socket, directory and the git config
# directory. This gets the host ssh and git configuration
# working inside the container.
[ -e "$SSH_AUTH_SOCK" ] && arg "-v $SSH_AUTH_SOCK:/run/user/1000/ssh-auth-sock"
[ -d "$HOME/.ssh" ] && arg "-v $HOME/.ssh:/home/user/.ssh"
[ -d "$HOME/.config/git" ] && arg "-v $HOME/.config/git:/home/user/.config/git"
# Mount host directories with programming projects.
[ -d "$HOME/Code" ] && arg "-v $HOME/Code:/home/user/Code"
[ -d "$HOME/.config/devcontainer" ] && arg "-v $HOME/.config/devcontainer:/home/user/.dev"
# Add volumes for .local and .cache so these survive
# container restarts.
arg "-v $name-local:/home/user/.local"
arg "-v $name-cache:/home/user/.cache"
}
### MAIN ###
name="dev"
image="git.plabble.org/job79/dev:latest"
fetch=false
while test $# -gt 0; do
case "$1" in
--image | -i) shift && fetch=true && image="$1" ;;
--fetch | -f) fetch=true ;;
-*) log "unknown argument '$1'" 'x' 31 ;;
*) name="$1" ;;
esac
shift
done
if [ "$fetch" = true ] || [ "$(podman container inspect "$name" -f {{.State.Running}} 2>&1)" != 'true' ]; then
log "fetching devcontainer updates..."
if [ "$(podman pull -q "$image" 2>&1)" != "$(podman container inspect "$name" -f {{.Image}} 2>&1)" ]; then
log "container image downloaded" '✓' 32
podman container rm -f -t 1 "$name" 1>/dev/null
podman run -td $(run_args) "$image"
else
log "no updates available" '✓' 32
fi
fi
podman start "$name" 1>/dev/null
podman exec --detach-keys "" -it "$name" bash -l