diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 565289e..3177581 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,11 +20,11 @@ build-image: parallel: matrix: - RECIPE: - # - jp-desktop.yml - jp-desktop-nvidia.yml - jp-laptop.yml - jp-laptop-cosmic.yml - cp-laptop.yml + - jp-truenas.yml variables: DOCKER_HOST: tcp://docker:2376 DOCKER_TLS_CERTDIR: /certs @@ -37,13 +37,4 @@ build-image: - export COSIGN_PRIVATE_KEY=$(cat .secure_files/cosign.key) script: - sleep 5 - # - bluebuild build -vv -B docker -p ./recipes/*.yml - bluebuild build -B docker -S sigstore -p ./recipes/$RECIPE - # after_script: - # - docker system df - # - docker system prune -f - # - | - # docker images --format '{{.ID}} {{.CreatedSince}}' | grep -E 'weeks|months' | while read -r line; do - # image_id=$(echo $line | awk '{print $1}') - # docker rmi -f $image_id - # done diff --git a/recipes/common/dev-apps.yml b/recipes/common/dev-apps.yml new file mode 100644 index 0000000..ab60257 --- /dev/null +++ b/recipes/common/dev-apps.yml @@ -0,0 +1,5 @@ +modules: + - type: rpm-ostree + install: + - virt-manager + - alacritty diff --git a/recipes/common/dev-packages.yml b/recipes/common/dev-packages.yml index cadeff4..d5877f2 100644 --- a/recipes/common/dev-packages.yml +++ b/recipes/common/dev-packages.yml @@ -12,7 +12,6 @@ modules: - https://cli.github.com/packages/rpm/gh-cli.repo install: - cmake - - virt-manager - "gcc-c++" - earthly - kubectl @@ -22,7 +21,6 @@ modules: - gcc-aarch64-linux-gnu - gcc-c++-aarch64-linux-gnu - musl-gcc - - alacritty - openssl-devel - bat - gh @@ -39,5 +37,5 @@ modules: scripts: - install-mkcert.sh - install-codelldb.sh - snippets: - - curl -fsSL https://ollama.com/install.sh | sed 's|/usr/local/bin||' | sh + # snippets: + # - curl -fsSL https://ollama.com/install.sh | sed 's|/usr/local/bin||' | sh diff --git a/recipes/common/helix.yml b/recipes/common/helix.yml index bb80247..b20766c 100644 --- a/recipes/common/helix.yml +++ b/recipes/common/helix.yml @@ -3,7 +3,6 @@ stages: from: rust modules: - type: script - no-cache: true scripts: - install-helix.sh modules: diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml index ca1ca1e..b300ebc 100644 --- a/recipes/common/jp-common.yml +++ b/recipes/common/jp-common.yml @@ -4,6 +4,7 @@ modules: - from-file: common/jp-packages.yml - from-file: common/gaming.yml - from-file: common/dev-packages.yml + - from-file: common/dev-apps.yml - from-file: common/updates.yml - type: files files: diff --git a/recipes/jp-truenas.yml b/recipes/jp-truenas.yml new file mode 100644 index 0000000..7f7835b --- /dev/null +++ b/recipes/jp-truenas.yml @@ -0,0 +1,14 @@ +name: jp-truenas +base-image: ghcr.io/secureblue/securecore-main-userns-hardened +image-version: 40 +description: The image of Wunker OS for JP's TrueNAS Server. +stages: + - from-file: common/helix.yml +modules: + - from-file: common/updates.yml + - type: fonts + nerd-fonts: + - JetBrainsMono + - NerdFontsSymbolsOnly + - from-file: common/dev-packages.yml + - from-file: common/helix.yml