chore: move bakery to dedicated directory

silitics · Mar 17, 2024 · 0a8128c · 0a8128c
1 parent aeddf81
commit 0a8128c
Show file tree

Hide file tree

Showing 52 changed files with 10 additions and 14 deletions.
diff --git 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
@@ -1,3 +0,0 @@
-[submodule "extra"]
-	path = repositories/extra
-	url = ../rugpi-extra.git

diff --git a/docker/Dockerfile.rugpi-bakery → bakery/Dockerfile b/docker/Dockerfile.rugpi-bakery → 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 → bakery/layers/bakery/00-base.sh b/docker/layers/bakery/00-base.sh → bakery/layers/bakery/00-base.sh
diff --git a/docker/layers/bakery/10-setup.sh → bakery/layers/bakery/10-setup.sh b/docker/layers/bakery/10-setup.sh → bakery/layers/bakery/10-setup.sh
diff --git a/docker/layers/build-env/00-base.sh → bakery/layers/build-env/00-base.sh b/docker/layers/build-env/00-base.sh → bakery/layers/build-env/00-base.sh
diff --git a/docker/layers/build-env/10-rust.sh → bakery/layers/build-env/10-rust.sh b/docker/layers/build-env/10-rust.sh → bakery/layers/build-env/10-rust.sh
diff --git a/docker/layers/build-env/20-libs.sh → bakery/layers/build-env/20-libs.sh b/docker/layers/build-env/20-libs.sh → bakery/layers/build-env/20-libs.sh
diff --git a/docker/layers/builder/00-prepare.sh → bakery/layers/builder/00-prepare.sh b/docker/layers/builder/00-prepare.sh → bakery/layers/builder/00-prepare.sh
diff --git a/docker/layers/builder/10-build.sh → bakery/layers/builder/10-build.sh b/docker/layers/builder/10-build.sh → bakery/layers/builder/10-build.sh
diff --git a/...s/core/layers/raspios-bookworm.arm64.toml → ...s/core/layers/raspios-bookworm.arm64.toml b/...s/core/layers/raspios-bookworm.arm64.toml → ...s/core/layers/raspios-bookworm.arm64.toml
diff --git a/...s/core/layers/raspios-bookworm.armhf.toml → ...s/core/layers/raspios-bookworm.armhf.toml b/...s/core/layers/raspios-bookworm.armhf.toml → ...s/core/layers/raspios-bookworm.armhf.toml
diff --git a/...s/core/layers/raspios-bullseye.arm64.toml → ...s/core/layers/raspios-bullseye.arm64.toml b/...s/core/layers/raspios-bullseye.arm64.toml → ...s/core/layers/raspios-bullseye.arm64.toml
diff --git a/...s/core/layers/raspios-bullseye.armhf.toml → ...s/core/layers/raspios-bullseye.armhf.toml b/...s/core/layers/raspios-bullseye.armhf.toml → ...s/core/layers/raspios-bullseye.armhf.toml
diff --git a/...ries/core/recipes/apt-cleanup/recipe.toml → ...ries/core/recipes/apt-cleanup/recipe.toml b/...ries/core/recipes/apt-cleanup/recipe.toml → ...ries/core/recipes/apt-cleanup/recipe.toml
diff --git a/...e/recipes/apt-cleanup/steps/00-install.sh → ...e/recipes/apt-cleanup/steps/00-install.sh b/...e/recipes/apt-cleanup/steps/00-install.sh → ...e/recipes/apt-cleanup/steps/00-install.sh
diff --git a/...ories/core/recipes/apt-update/recipe.toml → ...ories/core/recipes/apt-update/recipe.toml b/...ories/core/recipes/apt-update/recipe.toml → ...ories/core/recipes/apt-update/recipe.toml
diff --git a/...re/recipes/apt-update/steps/00-install.sh → ...re/recipes/apt-update/steps/00-install.sh b/...re/recipes/apt-update/steps/00-install.sh → ...re/recipes/apt-update/steps/00-install.sh
diff --git a/...ries/core/recipes/apt-upgrade/recipe.toml → ...ries/core/recipes/apt-upgrade/recipe.toml b/...ries/core/recipes/apt-upgrade/recipe.toml → ...ries/core/recipes/apt-upgrade/recipe.toml
diff --git a/...e/recipes/apt-upgrade/steps/00-install.sh → ...e/recipes/apt-upgrade/steps/00-install.sh b/...e/recipes/apt-upgrade/steps/00-install.sh → ...e/recipes/apt-upgrade/steps/00-install.sh
diff --git a/...ies/core/recipes/disable-swap/recipe.toml → ...ies/core/recipes/disable-swap/recipe.toml b/...ies/core/recipes/disable-swap/recipe.toml → ...ies/core/recipes/disable-swap/recipe.toml
diff --git a/.../recipes/disable-swap/steps/00-install.sh → .../recipes/disable-swap/steps/00-install.sh b/.../recipes/disable-swap/steps/00-install.sh → .../recipes/disable-swap/steps/00-install.sh
diff --git a/...s/core/recipes/eth0-static-ip/recipe.toml → ...s/core/recipes/eth0-static-ip/recipe.toml b/...s/core/recipes/eth0-static-ip/recipe.toml → ...s/core/recipes/eth0-static-ip/recipe.toml
diff --git a/...ecipes/eth0-static-ip/steps/00-install.sh → ...ecipes/eth0-static-ip/steps/00-install.sh b/...ecipes/eth0-static-ip/steps/00-install.sh → ...ecipes/eth0-static-ip/steps/00-install.sh
diff --git a/...sist-fake-hwclock/files/fake-hwclock.toml → ...sist-fake-hwclock/files/fake-hwclock.toml b/...sist-fake-hwclock/files/fake-hwclock.toml → ...sist-fake-hwclock/files/fake-hwclock.toml
diff --git a/.../recipes/persist-fake-hwclock/recipe.toml → .../recipes/persist-fake-hwclock/recipe.toml b/.../recipes/persist-fake-hwclock/recipe.toml → .../recipes/persist-fake-hwclock/recipe.toml
diff --git a/.../persist-fake-hwclock/steps/00-install.sh → .../persist-fake-hwclock/steps/00-install.sh b/.../persist-fake-hwclock/steps/00-install.sh → .../persist-fake-hwclock/steps/00-install.sh
diff --git a/...es/persist-root-home/files/root-home.toml → ...es/persist-root-home/files/root-home.toml b/...es/persist-root-home/files/root-home.toml → ...es/persist-root-home/files/root-home.toml
diff --git a/...ore/recipes/persist-root-home/recipe.toml → ...ore/recipes/persist-root-home/recipe.toml b/...ore/recipes/persist-root-home/recipe.toml → ...ore/recipes/persist-root-home/recipe.toml
diff --git a/...pes/persist-root-home/steps/00-install.sh → ...pes/persist-root-home/steps/00-install.sh b/...pes/persist-root-home/steps/00-install.sh → ...pes/persist-root-home/steps/00-install.sh
diff --git a/...ories/core/recipes/pi-cleanup/recipe.toml → ...ories/core/recipes/pi-cleanup/recipe.toml b/...ories/core/recipes/pi-cleanup/recipe.toml → ...ories/core/recipes/pi-cleanup/recipe.toml
diff --git a/...re/recipes/pi-cleanup/steps/00-install.sh → ...re/recipes/pi-cleanup/steps/00-install.sh b/...re/recipes/pi-cleanup/steps/00-install.sh → ...re/recipes/pi-cleanup/steps/00-install.sh
diff --git a/...ries/core/recipes/raspberrypi/recipe.toml → ...ries/core/recipes/raspberrypi/recipe.toml b/...ries/core/recipes/raspberrypi/recipe.toml → ...ries/core/recipes/raspberrypi/recipe.toml
diff --git a/...to-commit/files/rugpi-auto-commit.service → ...to-commit/files/rugpi-auto-commit.service b/...to-commit/files/rugpi-auto-commit.service → ...to-commit/files/rugpi-auto-commit.service
diff --git a/...ore/recipes/rugpi-auto-commit/recipe.toml → ...ore/recipes/rugpi-auto-commit/recipe.toml b/...ore/recipes/rugpi-auto-commit/recipe.toml → ...ore/recipes/rugpi-auto-commit/recipe.toml
diff --git a/...pes/rugpi-auto-commit/steps/00-install.sh → ...pes/rugpi-auto-commit/steps/00-install.sh b/...pes/rugpi-auto-commit/steps/00-install.sh → ...pes/rugpi-auto-commit/steps/00-install.sh
diff --git a/...s/core/recipes/rugpi-ctrl/files/reboot.sh → ...s/core/recipes/rugpi-ctrl/files/reboot.sh b/...s/core/recipes/rugpi-ctrl/files/reboot.sh → ...s/core/recipes/rugpi-ctrl/files/reboot.sh
diff --git a/...ipes/rugpi-ctrl/files/rugpi-admin.service → ...ipes/rugpi-ctrl/files/rugpi-admin.service b/...ipes/rugpi-ctrl/files/rugpi-admin.service → ...ipes/rugpi-ctrl/files/rugpi-admin.service
diff --git a/...ories/core/recipes/rugpi-ctrl/recipe.toml → ...ories/core/recipes/rugpi-ctrl/recipe.toml b/...ories/core/recipes/rugpi-ctrl/recipe.toml → ...ories/core/recipes/rugpi-ctrl/recipe.toml
diff --git a/...core/recipes/rugpi-ctrl/steps/00-packages → ...core/recipes/rugpi-ctrl/steps/00-packages b/...core/recipes/rugpi-ctrl/steps/00-packages → ...core/recipes/rugpi-ctrl/steps/00-packages
diff --git a/...s/core/recipes/rugpi-ctrl/steps/01-run.sh → ...s/core/recipes/rugpi-ctrl/steps/01-run.sh b/...s/core/recipes/rugpi-ctrl/steps/01-run.sh → ...s/core/recipes/rugpi-ctrl/steps/01-run.sh
diff --git a/...s/core/recipes/rugpi-ctrl/steps/02-run.py → ...s/core/recipes/rugpi-ctrl/steps/02-run.py b/...s/core/recipes/rugpi-ctrl/steps/02-run.py → ...s/core/recipes/rugpi-ctrl/steps/02-run.py
diff --git a/...re/recipes/rugpi-ctrl/steps/03-install.sh → ...re/recipes/rugpi-ctrl/steps/03-install.sh b/...re/recipes/rugpi-ctrl/steps/03-install.sh → ...re/recipes/rugpi-ctrl/steps/03-install.sh
diff --git a/...ies/core/recipes/set-hostname/recipe.toml → ...ies/core/recipes/set-hostname/recipe.toml b/...ies/core/recipes/set-hostname/recipe.toml → ...ies/core/recipes/set-hostname/recipe.toml
diff --git a/.../recipes/set-hostname/steps/00-install.sh → .../recipes/set-hostname/steps/00-install.sh b/.../recipes/set-hostname/steps/00-install.sh → .../recipes/set-hostname/steps/00-install.sh
diff --git a/...s/ssh/files/hydrate-ssh-host-keys.service → ...s/ssh/files/hydrate-ssh-host-keys.service b/...s/ssh/files/hydrate-ssh-host-keys.service → ...s/ssh/files/hydrate-ssh-host-keys.service
diff --git a/...ecipes/ssh/files/hydrate-ssh-host-keys.sh → ...ecipes/ssh/files/hydrate-ssh-host-keys.sh b/...ecipes/ssh/files/hydrate-ssh-host-keys.sh → ...ecipes/ssh/files/hydrate-ssh-host-keys.sh
diff --git a/repositories/core/recipes/ssh/recipe.toml → ...repositories/core/recipes/ssh/recipe.toml b/repositories/core/recipes/ssh/recipe.toml → ...repositories/core/recipes/ssh/recipe.toml
diff --git a/...ries/core/recipes/ssh/steps/00-install.sh → ...ries/core/recipes/ssh/steps/00-install.sh b/...ries/core/recipes/ssh/steps/00-install.sh → ...ries/core/recipes/ssh/steps/00-install.sh
diff --git a/repositories/core/rugpi-repository.toml → ...y/repositories/core/rugpi-repository.toml b/repositories/core/rugpi-repository.toml → ...y/repositories/core/rugpi-repository.toml
diff --git a/repositories/extra b/repositories/extra
diff --git 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)