-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge as many commands as possible together to reduce the amount of layers used.
- Loading branch information
Showing
3 changed files
with
24 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,24 +10,18 @@ LABEL com.github.containers.toolbox="true" \ | |
| summary="Base image for creating Fedora toolbox containers" \ | ||
| maintainer="Debarshi Ray <[email protected]>" | ||
|
|
||
| COPY README.md / | ||
|
|
||
| RUN rm /etc/rpm/macros.image-language-conf | ||
| RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf | ||
|
|
||
| RUN dnf -y upgrade | ||
| RUN dnf -y swap coreutils-single coreutils-full | ||
| RUN dnf -y swap glibc-minimal-langpack glibc-all-langpacks | ||
|
|
||
| COPY missing-docs / | ||
| RUN dnf -y reinstall $(<missing-docs) | ||
| RUN rm /missing-docs | ||
| COPY README.md missing-docs extra-packages ensure-files / | ||
|
|
||
| COPY extra-packages / | ||
| RUN dnf -y install $(<extra-packages) | ||
| RUN rm /extra-packages | ||
| RUN dnf -y upgrade && \ | ||
| dnf -y swap coreutils-single coreutils-full && \ | ||
| dnf -y swap glibc-minimal-langpack glibc-all-langpacks && \ | ||
| dnf -y reinstall $(<missing-docs) && \ | ||
| dnf -y install $(<extra-packages) && \ | ||
| dnf clean all | ||
|
|
||
| COPY ensure-files / | ||
| RUN ret_val=0; \ | ||
| while read file; do \ | ||
| if ! compgen -G "$file" >/dev/null; then \ | ||
|
|
@@ -39,6 +33,5 @@ RUN ret_val=0; \ | |
| if [ "$ret_val" -ne 0 ]; then \ | ||
| false; \ | ||
| fi | ||
| RUN rm /ensure-files | ||
|
|
||
| RUN dnf clean all | ||
| RUN rm /missing-docs /extra-packages /ensure-files | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,24 +10,18 @@ LABEL com.github.containers.toolbox="true" \ | |
| summary="Base image for creating Fedora toolbox containers" \ | ||
| maintainer="Debarshi Ray <[email protected]>" | ||
|
|
||
| COPY README.md / | ||
|
|
||
| RUN rm /etc/rpm/macros.image-language-conf | ||
| RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf | ||
|
|
||
| RUN dnf -y upgrade | ||
| RUN dnf -y swap coreutils-single coreutils-full | ||
| RUN dnf -y swap glibc-minimal-langpack glibc-all-langpacks | ||
|
|
||
| COPY missing-docs / | ||
| RUN dnf -y reinstall $(<missing-docs) | ||
| RUN rm /missing-docs | ||
| COPY README.md missing-docs extra-packages ensure-files / | ||
|
|
||
| COPY extra-packages / | ||
| RUN dnf -y install $(<extra-packages) | ||
| RUN rm /extra-packages | ||
| RUN dnf -y upgrade && \ | ||
| dnf -y swap coreutils-single coreutils-full && \ | ||
| dnf -y swap glibc-minimal-langpack glibc-all-langpacks && \ | ||
| dnf -y reinstall $(<missing-docs) && \ | ||
| dnf -y install $(<extra-packages) && \ | ||
| dnf clean all | ||
|
|
||
| COPY ensure-files / | ||
| RUN ret_val=0; \ | ||
| while read file; do \ | ||
| if ! compgen -G "$file" >/dev/null; then \ | ||
|
|
@@ -39,6 +33,5 @@ RUN ret_val=0; \ | |
| if [ "$ret_val" -ne 0 ]; then \ | ||
| false; \ | ||
| fi | ||
| RUN rm /ensure-files | ||
|
|
||
| RUN dnf clean all | ||
| RUN rm /missing-docs /extra-packages /ensure-files | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,24 +10,18 @@ LABEL com.github.containers.toolbox="true" \ | |
| summary="Base image for creating Fedora toolbox containers" \ | ||
| maintainer="Debarshi Ray <[email protected]>" | ||
|
|
||
| COPY README.md / | ||
|
|
||
| RUN rm /etc/rpm/macros.image-language-conf | ||
| RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf | ||
|
|
||
| RUN dnf -y upgrade | ||
| RUN dnf -y swap coreutils-single coreutils-full | ||
| RUN dnf -y swap glibc-minimal-langpack glibc-all-langpacks | ||
|
|
||
| COPY missing-docs / | ||
| RUN dnf -y reinstall $(<missing-docs) | ||
| RUN rm /missing-docs | ||
| COPY README.md missing-docs extra-packages ensure-files / | ||
|
|
||
| COPY extra-packages / | ||
| RUN dnf -y install $(<extra-packages) | ||
| RUN rm /extra-packages | ||
| RUN dnf -y upgrade && \ | ||
| dnf -y swap coreutils-single coreutils-full && \ | ||
| dnf -y swap glibc-minimal-langpack glibc-all-langpacks && \ | ||
| dnf -y reinstall $(<missing-docs) && \ | ||
| dnf -y install $(<extra-packages) && \ | ||
| dnf clean all | ||
|
|
||
| COPY ensure-files / | ||
| RUN ret_val=0; \ | ||
| while read file; do \ | ||
| if ! compgen -G "$file" >/dev/null; then \ | ||
|
|
@@ -39,6 +33,5 @@ RUN ret_val=0; \ | |
| if [ "$ret_val" -ne 0 ]; then \ | ||
| false; \ | ||
| fi | ||
| RUN rm /ensure-files | ||
|
|
||
| RUN dnf clean all | ||
| RUN rm /missing-docs /extra-packages /ensure-files | ||