Skip to content

Commit

Permalink
Move conf/ into container/apt as it's apt configuration files that wi…
Browse files Browse the repository at this point in the history
…ll installed into the container.
  • Loading branch information
alee-ntap committed Nov 6, 2023
1 parent 6f26bff commit 8e03ace
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion container/build.containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion container/crossbuild.containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/ ./
Expand Down

0 comments on commit 8e03ace

Please sign in to comment.