wunker-bunker/wunker-os
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style!: change base-container to base-image (#49)

Browse Source 
#34
This commit is contained in:
Eino Rauhala
2023-04-26 20:15:16 +03:00
committed by GitHub
parent b3f7f07d6c
commit 1df862aae8
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@@ -46,7 +46,7 @@ jobs:
echo "IMAGE_NAME=$(yq '.name' ./${{ matrix.recipe }})" >> $GITHUB_ENV echo "IMAGE_NAME=$(yq '.name' ./${{ matrix.recipe }})" >> $GITHUB_ENV
echo "IMAGE_DESCRIPTION=$(yq '.description' ./${{ matrix.recipe }})" >> $GITHUB_ENV echo "IMAGE_DESCRIPTION=$(yq '.description' ./${{ matrix.recipe }})" >> $GITHUB_ENV
echo "FEDORA_MAJOR_VERSION=$(yq '.fedora-version' ./${{ matrix.recipe }})" >> $GITHUB_ENV echo "FEDORA_MAJOR_VERSION=$(yq '.fedora-version' ./${{ matrix.recipe }})" >> $GITHUB_ENV
echo "BASE_CONTAINER_URL=$(yq '.base-container' ./${{ matrix.recipe }})" >> $GITHUB_ENV echo "BASE_IMAGE_URL=$(yq '.base-image' ./${{ matrix.recipe }})" >> $GITHUB_ENV
- name: Generate tags - name: Generate tags
id: generate-tags id: generate-tags
@@ -114,7 +114,7 @@ jobs:
${{ steps.generate-tags.outputs.alias_tags }} ${{ steps.generate-tags.outputs.alias_tags }}
build-args: | build-args: |
FEDORA_MAJOR_VERSION=${{ env.FEDORA_MAJOR_VERSION }} FEDORA_MAJOR_VERSION=${{ env.FEDORA_MAJOR_VERSION }}
BASE_CONTAINER_URL=${{ env.BASE_CONTAINER_URL }} BASE_IMAGE_URL=${{ env.BASE_IMAGE_URL }}
RECIPE=${{ matrix.recipe }} RECIPE=${{ matrix.recipe }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
oci: false oci: false

4
Containerfile
View File

@@ -1,7 +1,7 @@
ARG FEDORA_MAJOR_VERSION=37 ARG FEDORA_MAJOR_VERSION=37
ARG BASE_CONTAINER_URL=ghcr.io/ublue-os/silverblue-main ARG BASE_IMAGE_URL=ghcr.io/ublue-os/silverblue-main
FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION} FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
ARG RECIPE ARG RECIPE
# copy over configuration files # copy over configuration files

2
README.md
View File

@@ -19,7 +19,7 @@ Don't worry, it only requires some basic knowledge about using the terminal and
The easiest way to start customizing is by looking at and modifying `recipe.yml`. It's documented using comments and should be pretty easy to understand. The easiest way to start customizing is by looking at and modifying `recipe.yml`. It's documented using comments and should be pretty easy to understand.
For the base-container field, you can use any other native container image. You will get all the features of that image, plus the ones added here! Check out the [uBlue images list](https://ublue.it/images/) to decide what to use! For the base-image field, you can use any other native container image. You will get all the features of that image, plus the ones added here! Check out the [uBlue images list](https://ublue.it/images/) to decide what to use!
If you want to add custom configuration files, you can just add them in the `etc` directory. If you need to add other directories, you can look at the Containerfile to see how it's done. Writing to any directories under `/var` in Fedora Silverblue are not supported and will not work, as those are user-managed. If you want to add custom configuration files, you can just add them in the `etc` directory. If you need to add other directories, you can look at the Containerfile to see how it's done. Writing to any directories under `/var` in Fedora Silverblue are not supported and will not work, as those are user-managed.

3
recipe.yml
View File

@@ -5,9 +5,8 @@
name: startingpoint name: startingpoint
# The native container image to build on top of # The native container image to build on top of
# images.
# Warning: Non-uBlue images might function unexpectly # Warning: Non-uBlue images might function unexpectly
base-container: ghcr.io/ublue-os/silverblue-main base-image: ghcr.io/ublue-os/silverblue-main
# What fedora version to use. Use an explicit version or `latest`. # What fedora version to use. Use an explicit version or `latest`.
# If you use `latest`, you will be automatically updated # If you use `latest`, you will be automatically updated