Move bin/ into container/ as we installs that will be installed into …

…the containers.
gardenlinux · Nov 6, 2023 · 6f26bff · 6f26bff
1 parent 9f98ab3
commit 6f26bff
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 This project is part of the gardenlinux organization on GitHub and focuses on package building for GardenLinux system.
 
 It contains:
-- `bin/`: This folder contains executable scripts installs into the container.
 - `container/`: This folder contains container-related files that define images and configurations.
   - `*.containerfile`: These files define container images.
+  - `bin/`: This folder contains executable scripts installs into the container.
   - `conf/`: This folder contains containers configurations on installed packages list and native container setup.
 - `conf/`: This folder contains general configuration files.
 - `misc/`: This folder contains miscellaneous files related to the project.

diff --git a/bin/build → container/bin/build b/bin/build → container/bin/build
diff --git a/bin/build_archdep → container/bin/build_archdep b/bin/build_archdep → container/bin/build_archdep
diff --git a/bin/build_indep → container/bin/build_indep b/bin/build_indep → container/bin/build_indep
diff --git a/bin/build_source → container/bin/build_source b/bin/build_source → container/bin/build_source
diff --git a/container/build.containerfile b/container/build.containerfile
@@ -37,7 +37,7 @@ RUN apt-get update \
     && find /tmp -mindepth 1 -delete
 
 # Copy the build scripts from bin/ into /usr/local/bin
-COPY bin/ /usr/local/bin
+COPY container/bin/ /usr/local/bin
 
 # Copy mini_sudo from stage 1
 COPY --from=mini_sudo /usr/local/bin/sudo /usr/local/bin/sudo

diff --git a/container/crossbuild.containerfile b/container/crossbuild.containerfile
@@ -57,7 +57,7 @@ RUN [ "/native/bash", "-c", "PATH=/native:$PATH ./setup_native import $(awk '{ p
 RUN find /tmp -mindepth 1 -delete
 
 # Copy the build scripts from bin to /usr/local/bin
-COPY bin/ /usr/local/bin
+COPY container/bin/ /usr/local/bin
 
 # Copy mini_sudo from stage 1
 COPY --from=mini_sudo /usr/local/bin/sudo /usr/local/bin/sudo