diff --git a/README.md b/README.md index e94bb9c..597e7a3 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ This project is part of the gardenlinux organization on GitHub and focuses on pa It contains: - `container/`: This folder contains container-related files that define images and configurations. - `*.containerfile`: These files define container images. + - `apt/`: This folder contains apt configuration files. - `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. - `scripts/`: This folder contains scripts for it's github actions workflow. diff --git a/conf/apt/preferences.d/local-pkgs b/container/apt/preferences.d/local-pkgs similarity index 100% rename from conf/apt/preferences.d/local-pkgs rename to container/apt/preferences.d/local-pkgs diff --git a/conf/apt/sources.list.d/debian-src.sources b/container/apt/sources.list.d/debian-src.sources similarity index 100% rename from conf/apt/sources.list.d/debian-src.sources rename to container/apt/sources.list.d/debian-src.sources diff --git a/conf/apt/sources.list.d/local-pkgs.list b/container/apt/sources.list.d/local-pkgs.list similarity index 100% rename from conf/apt/sources.list.d/local-pkgs.list rename to container/apt/sources.list.d/local-pkgs.list diff --git a/container/build.containerfile b/container/build.containerfile index c8fd6bd..5d3e74f 100755 --- a/container/build.containerfile +++ b/container/build.containerfile @@ -17,7 +17,7 @@ FROM $arch/$image WORKDIR /tmp # Copy repository configration files for apt -COPY conf/ /etc/ +COPY container/apt /etc/ # Create a directory for local packages and touch the Packages file RUN mkdir /pkgs && touch /pkgs/Packages diff --git a/container/crossbuild.containerfile b/container/crossbuild.containerfile index 03de273..213adf0 100644 --- a/container/crossbuild.containerfile +++ b/container/crossbuild.containerfile @@ -30,7 +30,7 @@ FROM $target_arch/$image WORKDIR /tmp # Copy repository configration files for apt -COPY conf/ /etc/ +COPY container/apt /etc/ # Copy setup_native and pkgs into the container COPY container/conf/ ./