diff --git a/README.md b/README.md index b9d64ff..e94bb9c 100644 --- 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 b/container/bin/build similarity index 100% rename from bin/build rename to container/bin/build diff --git a/bin/build_archdep b/container/bin/build_archdep similarity index 100% rename from bin/build_archdep rename to container/bin/build_archdep diff --git a/bin/build_indep b/container/bin/build_indep similarity index 100% rename from bin/build_indep rename to container/bin/build_indep diff --git a/bin/build_source b/container/bin/build_source similarity index 100% rename from bin/build_source rename to container/bin/build_source diff --git a/container/build.containerfile b/container/build.containerfile index 7c3a47a..c8fd6bd 100755 --- 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 index 9ccae8e..03de273 100644 --- 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