diff --git a/.github/workflows/build-rugpi-bakery.yml b/.github/workflows/build-rugpi-bakery.yml index 34b09df..64f2243 100644 --- a/.github/workflows/build-rugpi-bakery.yml +++ b/.github/workflows/build-rugpi-bakery.yml @@ -74,7 +74,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: docker/Dockerfile.rugpi-bakery + file: bakery/Dockerfile platforms: ${{ matrix.platform }} labels: ${{ needs.metadata.outputs.labels }} push: true diff --git a/.gitmodules b/.gitmodules index 65bb146..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "extra"] - path = repositories/extra - url = ../rugpi-extra.git diff --git a/docker/Dockerfile.rugpi-bakery b/bakery/Dockerfile similarity index 85% rename from docker/Dockerfile.rugpi-bakery rename to bakery/Dockerfile index ce12cf7..ad2ac22 100644 --- a/docker/Dockerfile.rugpi-bakery +++ b/bakery/Dockerfile @@ -5,7 +5,7 @@ ######################################################################################### FROM debian:latest as build-env -COPY docker/layers/build-env/00-base.sh /tmp/rugpi-docker/00-base.sh +COPY bakery/layers/build-env/00-base.sh /tmp/rugpi-docker/00-base.sh RUN /tmp/rugpi-docker/00-base.sh # Install Rust toolchain. @@ -14,13 +14,13 @@ ENV RUSTUP_HOME="/usr/local/rustup" \ PATH="/usr/local/cargo/bin:${PATH}" \ RUST_VERSION="1.76.0" -COPY docker/layers/build-env/10-rust.sh /tmp/rugpi-docker/10-rust.sh +COPY bakery/layers/build-env/10-rust.sh /tmp/rugpi-docker/10-rust.sh RUN /tmp/rugpi-docker/10-rust.sh # Install libraries and configure for cross compilation. ENV PKG_CONFIG_SYSROOT_DIR="/" -COPY docker/layers/build-env/20-libs.sh /tmp/rugpi-docker/20-libs.sh +COPY bakery/layers/build-env/20-libs.sh /tmp/rugpi-docker/20-libs.sh RUN /tmp/rugpi-docker/20-libs.sh ENV RUGPI_BUILD_ENV="true" @@ -48,11 +48,11 @@ RUN cargo chef prepare --recipe-path recipe.json FROM build-env AS builder COPY --from=planner /project/recipe.json recipe.json -COPY docker/layers/builder/00-prepare.sh /tmp/rugpi-docker/00-prepare.sh +COPY bakery/layers/builder/00-prepare.sh /tmp/rugpi-docker/00-prepare.sh RUN /tmp/rugpi-docker/00-prepare.sh COPY . . -COPY docker/layers/builder/10-build.sh /tmp/rugpi-docker/10-build.sh +COPY bakery/layers/builder/10-build.sh /tmp/rugpi-docker/10-build.sh RUN /tmp/rugpi-docker/10-build.sh @@ -63,7 +63,7 @@ RUN /tmp/rugpi-docker/10-build.sh ######################################################################################### FROM debian:latest AS bakery -COPY docker/layers/bakery/00-base.sh /tmp/rugpi-docker/00-base.sh +COPY bakery/layers/bakery/00-base.sh /tmp/rugpi-docker/00-base.sh RUN /tmp/rugpi-docker/00-base.sh RUN mkdir -p /usr/share/rugpi \ @@ -73,10 +73,10 @@ RUN mkdir -p /usr/share/rugpi \ && mv rpi-eeprom-master rpi-eeprom \ && rm -f rpi-eeprom-master.zip -COPY repositories /usr/share/rugpi/repositories +COPY bakery/repositories /usr/share/rugpi/repositories COPY boot /usr/share/rugpi/boot -COPY docker/layers/bakery/10-setup.sh /tmp/rugpi-docker/10-setup.sh +COPY bakery/layers/bakery/10-setup.sh /tmp/rugpi-docker/10-setup.sh RUN /tmp/rugpi-docker/10-setup.sh RUN mkdir -p /usr/share/rugpi/binaries/{arm64,armhf} diff --git a/docker/layers/bakery/00-base.sh b/bakery/layers/bakery/00-base.sh similarity index 100% rename from docker/layers/bakery/00-base.sh rename to bakery/layers/bakery/00-base.sh diff --git a/docker/layers/bakery/10-setup.sh b/bakery/layers/bakery/10-setup.sh similarity index 100% rename from docker/layers/bakery/10-setup.sh rename to bakery/layers/bakery/10-setup.sh diff --git a/docker/layers/build-env/00-base.sh b/bakery/layers/build-env/00-base.sh similarity index 100% rename from docker/layers/build-env/00-base.sh rename to bakery/layers/build-env/00-base.sh diff --git a/docker/layers/build-env/10-rust.sh b/bakery/layers/build-env/10-rust.sh similarity index 100% rename from docker/layers/build-env/10-rust.sh rename to bakery/layers/build-env/10-rust.sh diff --git a/docker/layers/build-env/20-libs.sh b/bakery/layers/build-env/20-libs.sh similarity index 100% rename from docker/layers/build-env/20-libs.sh rename to bakery/layers/build-env/20-libs.sh diff --git a/docker/layers/builder/00-prepare.sh b/bakery/layers/builder/00-prepare.sh similarity index 100% rename from docker/layers/builder/00-prepare.sh rename to bakery/layers/builder/00-prepare.sh diff --git a/docker/layers/builder/10-build.sh b/bakery/layers/builder/10-build.sh similarity index 100% rename from docker/layers/builder/10-build.sh rename to bakery/layers/builder/10-build.sh diff --git a/repositories/core/layers/raspios-bookworm.arm64.toml b/bakery/repositories/core/layers/raspios-bookworm.arm64.toml similarity index 100% rename from repositories/core/layers/raspios-bookworm.arm64.toml rename to bakery/repositories/core/layers/raspios-bookworm.arm64.toml diff --git a/repositories/core/layers/raspios-bookworm.armhf.toml b/bakery/repositories/core/layers/raspios-bookworm.armhf.toml similarity index 100% rename from repositories/core/layers/raspios-bookworm.armhf.toml rename to bakery/repositories/core/layers/raspios-bookworm.armhf.toml diff --git a/repositories/core/layers/raspios-bullseye.arm64.toml b/bakery/repositories/core/layers/raspios-bullseye.arm64.toml similarity index 100% rename from repositories/core/layers/raspios-bullseye.arm64.toml rename to bakery/repositories/core/layers/raspios-bullseye.arm64.toml diff --git a/repositories/core/layers/raspios-bullseye.armhf.toml b/bakery/repositories/core/layers/raspios-bullseye.armhf.toml similarity index 100% rename from repositories/core/layers/raspios-bullseye.armhf.toml rename to bakery/repositories/core/layers/raspios-bullseye.armhf.toml diff --git a/repositories/core/recipes/apt-cleanup/recipe.toml b/bakery/repositories/core/recipes/apt-cleanup/recipe.toml similarity index 100% rename from repositories/core/recipes/apt-cleanup/recipe.toml rename to bakery/repositories/core/recipes/apt-cleanup/recipe.toml diff --git a/repositories/core/recipes/apt-cleanup/steps/00-install.sh b/bakery/repositories/core/recipes/apt-cleanup/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/apt-cleanup/steps/00-install.sh rename to bakery/repositories/core/recipes/apt-cleanup/steps/00-install.sh diff --git a/repositories/core/recipes/apt-update/recipe.toml b/bakery/repositories/core/recipes/apt-update/recipe.toml similarity index 100% rename from repositories/core/recipes/apt-update/recipe.toml rename to bakery/repositories/core/recipes/apt-update/recipe.toml diff --git a/repositories/core/recipes/apt-update/steps/00-install.sh b/bakery/repositories/core/recipes/apt-update/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/apt-update/steps/00-install.sh rename to bakery/repositories/core/recipes/apt-update/steps/00-install.sh diff --git a/repositories/core/recipes/apt-upgrade/recipe.toml b/bakery/repositories/core/recipes/apt-upgrade/recipe.toml similarity index 100% rename from repositories/core/recipes/apt-upgrade/recipe.toml rename to bakery/repositories/core/recipes/apt-upgrade/recipe.toml diff --git a/repositories/core/recipes/apt-upgrade/steps/00-install.sh b/bakery/repositories/core/recipes/apt-upgrade/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/apt-upgrade/steps/00-install.sh rename to bakery/repositories/core/recipes/apt-upgrade/steps/00-install.sh diff --git a/repositories/core/recipes/disable-swap/recipe.toml b/bakery/repositories/core/recipes/disable-swap/recipe.toml similarity index 100% rename from repositories/core/recipes/disable-swap/recipe.toml rename to bakery/repositories/core/recipes/disable-swap/recipe.toml diff --git a/repositories/core/recipes/disable-swap/steps/00-install.sh b/bakery/repositories/core/recipes/disable-swap/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/disable-swap/steps/00-install.sh rename to bakery/repositories/core/recipes/disable-swap/steps/00-install.sh diff --git a/repositories/core/recipes/eth0-static-ip/recipe.toml b/bakery/repositories/core/recipes/eth0-static-ip/recipe.toml similarity index 100% rename from repositories/core/recipes/eth0-static-ip/recipe.toml rename to bakery/repositories/core/recipes/eth0-static-ip/recipe.toml diff --git a/repositories/core/recipes/eth0-static-ip/steps/00-install.sh b/bakery/repositories/core/recipes/eth0-static-ip/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/eth0-static-ip/steps/00-install.sh rename to bakery/repositories/core/recipes/eth0-static-ip/steps/00-install.sh diff --git a/repositories/core/recipes/persist-fake-hwclock/files/fake-hwclock.toml b/bakery/repositories/core/recipes/persist-fake-hwclock/files/fake-hwclock.toml similarity index 100% rename from repositories/core/recipes/persist-fake-hwclock/files/fake-hwclock.toml rename to bakery/repositories/core/recipes/persist-fake-hwclock/files/fake-hwclock.toml diff --git a/repositories/core/recipes/persist-fake-hwclock/recipe.toml b/bakery/repositories/core/recipes/persist-fake-hwclock/recipe.toml similarity index 100% rename from repositories/core/recipes/persist-fake-hwclock/recipe.toml rename to bakery/repositories/core/recipes/persist-fake-hwclock/recipe.toml diff --git a/repositories/core/recipes/persist-fake-hwclock/steps/00-install.sh b/bakery/repositories/core/recipes/persist-fake-hwclock/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/persist-fake-hwclock/steps/00-install.sh rename to bakery/repositories/core/recipes/persist-fake-hwclock/steps/00-install.sh diff --git a/repositories/core/recipes/persist-root-home/files/root-home.toml b/bakery/repositories/core/recipes/persist-root-home/files/root-home.toml similarity index 100% rename from repositories/core/recipes/persist-root-home/files/root-home.toml rename to bakery/repositories/core/recipes/persist-root-home/files/root-home.toml diff --git a/repositories/core/recipes/persist-root-home/recipe.toml b/bakery/repositories/core/recipes/persist-root-home/recipe.toml similarity index 100% rename from repositories/core/recipes/persist-root-home/recipe.toml rename to bakery/repositories/core/recipes/persist-root-home/recipe.toml diff --git a/repositories/core/recipes/persist-root-home/steps/00-install.sh b/bakery/repositories/core/recipes/persist-root-home/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/persist-root-home/steps/00-install.sh rename to bakery/repositories/core/recipes/persist-root-home/steps/00-install.sh diff --git a/repositories/core/recipes/pi-cleanup/recipe.toml b/bakery/repositories/core/recipes/pi-cleanup/recipe.toml similarity index 100% rename from repositories/core/recipes/pi-cleanup/recipe.toml rename to bakery/repositories/core/recipes/pi-cleanup/recipe.toml diff --git a/repositories/core/recipes/pi-cleanup/steps/00-install.sh b/bakery/repositories/core/recipes/pi-cleanup/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/pi-cleanup/steps/00-install.sh rename to bakery/repositories/core/recipes/pi-cleanup/steps/00-install.sh diff --git a/repositories/core/recipes/raspberrypi/recipe.toml b/bakery/repositories/core/recipes/raspberrypi/recipe.toml similarity index 100% rename from repositories/core/recipes/raspberrypi/recipe.toml rename to bakery/repositories/core/recipes/raspberrypi/recipe.toml diff --git a/repositories/core/recipes/rugpi-auto-commit/files/rugpi-auto-commit.service b/bakery/repositories/core/recipes/rugpi-auto-commit/files/rugpi-auto-commit.service similarity index 100% rename from repositories/core/recipes/rugpi-auto-commit/files/rugpi-auto-commit.service rename to bakery/repositories/core/recipes/rugpi-auto-commit/files/rugpi-auto-commit.service diff --git a/repositories/core/recipes/rugpi-auto-commit/recipe.toml b/bakery/repositories/core/recipes/rugpi-auto-commit/recipe.toml similarity index 100% rename from repositories/core/recipes/rugpi-auto-commit/recipe.toml rename to bakery/repositories/core/recipes/rugpi-auto-commit/recipe.toml diff --git a/repositories/core/recipes/rugpi-auto-commit/steps/00-install.sh b/bakery/repositories/core/recipes/rugpi-auto-commit/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/rugpi-auto-commit/steps/00-install.sh rename to bakery/repositories/core/recipes/rugpi-auto-commit/steps/00-install.sh diff --git a/repositories/core/recipes/rugpi-ctrl/files/reboot.sh b/bakery/repositories/core/recipes/rugpi-ctrl/files/reboot.sh similarity index 100% rename from repositories/core/recipes/rugpi-ctrl/files/reboot.sh rename to bakery/repositories/core/recipes/rugpi-ctrl/files/reboot.sh diff --git a/repositories/core/recipes/rugpi-ctrl/files/rugpi-admin.service b/bakery/repositories/core/recipes/rugpi-ctrl/files/rugpi-admin.service similarity index 100% rename from repositories/core/recipes/rugpi-ctrl/files/rugpi-admin.service rename to bakery/repositories/core/recipes/rugpi-ctrl/files/rugpi-admin.service diff --git a/repositories/core/recipes/rugpi-ctrl/recipe.toml b/bakery/repositories/core/recipes/rugpi-ctrl/recipe.toml similarity index 100% rename from repositories/core/recipes/rugpi-ctrl/recipe.toml rename to bakery/repositories/core/recipes/rugpi-ctrl/recipe.toml diff --git a/repositories/core/recipes/rugpi-ctrl/steps/00-packages b/bakery/repositories/core/recipes/rugpi-ctrl/steps/00-packages similarity index 100% rename from repositories/core/recipes/rugpi-ctrl/steps/00-packages rename to bakery/repositories/core/recipes/rugpi-ctrl/steps/00-packages diff --git a/repositories/core/recipes/rugpi-ctrl/steps/01-run.sh b/bakery/repositories/core/recipes/rugpi-ctrl/steps/01-run.sh similarity index 100% rename from repositories/core/recipes/rugpi-ctrl/steps/01-run.sh rename to bakery/repositories/core/recipes/rugpi-ctrl/steps/01-run.sh diff --git a/repositories/core/recipes/rugpi-ctrl/steps/02-run.py b/bakery/repositories/core/recipes/rugpi-ctrl/steps/02-run.py similarity index 100% rename from repositories/core/recipes/rugpi-ctrl/steps/02-run.py rename to bakery/repositories/core/recipes/rugpi-ctrl/steps/02-run.py diff --git a/repositories/core/recipes/rugpi-ctrl/steps/03-install.sh b/bakery/repositories/core/recipes/rugpi-ctrl/steps/03-install.sh similarity index 100% rename from repositories/core/recipes/rugpi-ctrl/steps/03-install.sh rename to bakery/repositories/core/recipes/rugpi-ctrl/steps/03-install.sh diff --git a/repositories/core/recipes/set-hostname/recipe.toml b/bakery/repositories/core/recipes/set-hostname/recipe.toml similarity index 100% rename from repositories/core/recipes/set-hostname/recipe.toml rename to bakery/repositories/core/recipes/set-hostname/recipe.toml diff --git a/repositories/core/recipes/set-hostname/steps/00-install.sh b/bakery/repositories/core/recipes/set-hostname/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/set-hostname/steps/00-install.sh rename to bakery/repositories/core/recipes/set-hostname/steps/00-install.sh diff --git a/repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.service b/bakery/repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.service similarity index 100% rename from repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.service rename to bakery/repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.service diff --git a/repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.sh b/bakery/repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.sh similarity index 100% rename from repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.sh rename to bakery/repositories/core/recipes/ssh/files/hydrate-ssh-host-keys.sh diff --git a/repositories/core/recipes/ssh/recipe.toml b/bakery/repositories/core/recipes/ssh/recipe.toml similarity index 100% rename from repositories/core/recipes/ssh/recipe.toml rename to bakery/repositories/core/recipes/ssh/recipe.toml diff --git a/repositories/core/recipes/ssh/steps/00-install.sh b/bakery/repositories/core/recipes/ssh/steps/00-install.sh similarity index 100% rename from repositories/core/recipes/ssh/steps/00-install.sh rename to bakery/repositories/core/recipes/ssh/steps/00-install.sh diff --git a/repositories/core/rugpi-repository.toml b/bakery/repositories/core/rugpi-repository.toml similarity index 100% rename from repositories/core/rugpi-repository.toml rename to bakery/repositories/core/rugpi-repository.toml diff --git a/repositories/extra b/repositories/extra deleted file mode 160000 index dbd7ce4..0000000 --- a/repositories/extra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dbd7ce4f4059b345ef595fadf8d0c087817b3861 diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 29354e8..f2e0ead 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -34,7 +34,7 @@ fn main() -> anyhow::Result<()> { "-t", "ghcr.io/silitics/rugpi-bakery:dev", "-f", - "docker/Dockerfile.rugpi-bakery", + "bakery/Dockerfile", "." ] .with_stdout(Out::Inherit)