Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decrease commands to reduce layers #4

Merged
merged 15 commits into from
Oct 31, 2023
+78 −30
Merged

Decrease commands to reduce layers #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d29e695
Combining commands for build and install mini_sudo.
alee-ntap Oct 27, 2023
cdbf4a4
Combining two files in same directly in one COPY command.
alee-ntap Oct 27, 2023
b9edaa5
Combining multiple RUN commands for essential packages for package bu…
alee-ntap Oct 27, 2023
5b88f9a
Combining files in same dir in one COPY command.
alee-ntap Oct 27, 2023
b6ad31b
Add a new line to separate comments from another command.
alee-ntap Oct 30, 2023
4136d95
Combining commands for build and install mini_sudo.
alee-ntap Oct 30, 2023
22d8d38
Combining files into one COPY command.
alee-ntap Oct 30, 2023
06cdb95
Combining multiple RUN commands for setup_native script.
alee-ntap Oct 30, 2023
2ce82b4
Combining two files in same directly in one COPY command.
alee-ntap Oct 30, 2023
c7ed4e4
Combining multiple RUN commands for build envirnoment setup.
alee-ntap Oct 30, 2023
2d89cb9
Breaks RUN command with gcc tests and combine the clean up command.
alee-ntap Oct 30, 2023
9c63dea
Combining files into one COPY command.
alee-ntap Oct 30, 2023
961c64a
Add comments.
alee-ntap Oct 30, 2023
fa84227
Combining multiple RUN commands for build envirnoment setup and tests.
alee-ntap Oct 30, 2023
2eadedd
Run clean up after setup_native command.
alee-ntap Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions build.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,49 @@
# Use build arguments to specify the base image and architecture
ARG image=debian:testing
ARG arch=amd64

# Stage 1: Build and install mini_sudo
FROM $arch/$image AS mini_sudo
WORKDIR /tmp
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y gcc libc-dev
COPY mini_sudo.c ./
RUN gcc -Wall -Werror -static -o sudo mini_sudo.c
RUN install -m 6755 sudo /usr/local/bin/sudo
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install \
--no-install-recommends -y gcc libc-dev \
&& gcc -Wall -Werror -static -o sudo mini_sudo.c \
&& install -m 6755 sudo /usr/local/bin/sudo

# Stage 2: Final image
FROM $arch/$image
WORKDIR /tmp
COPY debian-src.sources /etc/apt/sources.list.d/
COPY local-pkgs.list /etc/apt/sources.list.d/

# Copy repository configration files for apt
COPY debian-src.sources local-pkgs.list /etc/apt/sources.list.d/
COPY local-pkgs /etc/apt/preferences.d/

# Create a directory for local packages and touch the Packages file
RUN mkdir /pkgs && touch /pkgs/Packages

# Copy the package list file
COPY pkgs ./
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y build-essential ca-certificates debhelper devscripts git sudo yq $(awk '{ print $1 }' pkgs)
RUN apt-mark hold $(awk '{ print $1 }' pkgs)
RUN gcc --print-search-dir && echo 'int main() { return 0; }' > main.c && gcc -o main main.c && ./main
COPY build_source /usr/local/bin/
COPY build_indep /usr/local/bin/
COPY build_archdep /usr/local/bin/
COPY build /usr/local/bin/
RUN find /tmp -mindepth 1 -delete

# Install packages from pkgs list and mark them as held, test gcc and cleanup
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install \
--no-install-recommends -y build-essential ca-certificates \
debhelper devscripts git sudo yq $(awk '{ print $1 }' pkgs) \
&& apt-mark hold $(awk '{ print $1 }' pkgs) \
&& gcc --print-search-dir && echo 'int main() { return 0; }' > main.c \
&& gcc -o main main.c \
&& ./main \
&& find /tmp -mindepth 1 -delete

# Copy the build scripts to /usr/local/bin
alee-ntap marked this conversation as resolved.
Show resolved Hide resolved
COPY build_source build_indep build_archdep build /usr/local/bin/

# Copy mini_sudo from stage 1
COPY --from=mini_sudo /usr/local/bin/sudo /usr/local/bin/sudo

# Create user dev and set the working directory for the user
RUN groupadd dev && useradd -m -g dev dev
USER dev
RUN mkdir /home/dev/work
Expand Down
62 changes: 45 additions & 17 deletions crossbuild.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,69 @@
# Use build arguments to specify the base image and architecture
ARG image=debian:testing
ARG native_arch=amd64
ARG target_arch=arm64v8

# Stage 1: Build and install mini_sudo
FROM $native_arch/$image AS mini_sudo
WORKDIR /tmp
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y gcc libc-dev
COPY mini_sudo.c ./
RUN gcc -Wall -Werror -static -o sudo mini_sudo.c
RUN install -m 6755 sudo /usr/local/bin/sudo
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install \
--no-install-recommends -y gcc libc-dev \
&& gcc -Wall -Werror -static -o sudo mini_sudo.c \
&& install -m 6755 sudo /usr/local/bin/sudo

# Stage 2: Build setup_native
FROM $native_arch/$image AS native
ARG gnu_arch=aarch64
WORKDIR /tmp
COPY pkgs ./
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y bbe patchelf $(sed 's/\$arch/'"$gnu_arch"'/' pkgs | awk '{ print $NF }')
COPY setup_native ./
RUN ./setup_native export $(sed 's/\$arch/'"$gnu_arch"'/' pkgs | awk '{ print $NF }')
COPY pkgs setup_native ./
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install \
--no-install-recommends -y bbe patchelf \
$(sed 's/\$arch/'"$gnu_arch"'/' pkgs | awk '{ print $NF }') \
&& ./setup_native export $(sed 's/\$arch/'"$gnu_arch"'/' pkgs \
| awk '{ print $NF }')

# Stage 3: Final image
FROM $target_arch/$image
WORKDIR /tmp
COPY debian-src.sources /etc/apt/sources.list.d/
COPY local-pkgs.list /etc/apt/sources.list.d/

# Copy repository configration files for apt
COPY debian-src.sources local-pkgs.list /etc/apt/sources.list.d/
COPY local-pkgs /etc/apt/preferences.d/
RUN mkdir /pkgs && touch /pkgs/Packages

# Install packages from pkgs list and mark them as held, test gcc
COPY pkgs ./
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y build-essential ca-certificates debhelper devscripts git yq $(awk '{ print $1 }' pkgs)
RUN apt-mark hold $(awk '{ print $1 }' pkgs)
RUN mkdir /pkgs \
&& touch /pkgs/Packages \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install \
--no-install-recommends -y build-essential ca-certificates debhelper \
devscripts git yq $(awk '{ print $1 }' pkgs) \
&& apt-mark hold $(awk '{ print $1 }' pkgs) \
&& gcc --print-search-dir \
&& echo 'int main() { return 0; }' > main.c \
&& gcc -o main main.c \
&& ./main

# Copy the native build artifacts from the previous stage
COPY --from=native /native /native

# Copy setup_native script and execute it
COPY setup_native ./
RUN [ "/native/bash", "-c", "PATH=/native:$PATH ./setup_native import $(awk '{ print $1 }' pkgs)" ]
RUN gcc --print-search-dir && echo 'int main() { return 0; }' > main.c && gcc -o main main.c && ./main
COPY build_source /usr/local/bin/
COPY build_indep /usr/local/bin/
COPY build_archdep /usr/local/bin/
COPY build /usr/local/bin/

# Clean up /tmp
RUN find /tmp -mindepth 1 -delete

# Copy the build scripts to /usr/local/bin
COPY build_source build_indep build_archdep build /usr/local/bin/

# Copy mini_sudo from stage 1
COPY --from=mini_sudo /usr/local/bin/sudo /usr/local/bin/sudo

# Create user dev and set the working directory for the user
RUN groupadd dev && useradd -m -g dev dev
USER dev
RUN mkdir /home/dev/work
Expand Down