v1.1.1 (#5)

Minor updates * Removing .empty files in bf-clear Build updates * Making Dockerfiles consistent
bfren · Aug 29, 2022 · 96bac60 · 96bac60
1 parent b24bb45
commit 96bac60
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 19 deletions.
diff --git a/10/Dockerfile b/10/Dockerfile
@@ -7,6 +7,7 @@ RUN apt update && apt install --no-install-recommends -y build-essential git &&
     make defconfig && make
 
 FROM debian:10.12-slim
+COPY --from=builder /tmp/busybox /bin/busybox
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-debian"
 
@@ -29,7 +30,6 @@ ENV \
 
 COPY ./overlay /
 COPY ./10/overlay /
-COPY --from=builder /tmp/busybox /bin/busybox
 
 RUN chmod +x ${BF_BIN}/bf-install && bf-install
 

diff --git a/11/Dockerfile b/11/Dockerfile
@@ -7,6 +7,7 @@ RUN apt update && apt install --no-install-recommends -y build-essential git &&
     make defconfig && make
 
 FROM debian:11.4-slim
+COPY --from=builder /tmp/busybox /bin/busybox
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-debian"
 
@@ -29,7 +30,6 @@ ENV \
 
 COPY ./overlay /
 COPY ./11/overlay /
-COPY --from=builder /tmp/busybox /bin/busybox
 
 RUN chmod +x ${BF_BIN}/bf-install && bf-install
 

diff --git a/12/Dockerfile b/12/Dockerfile
@@ -7,6 +7,7 @@ RUN apt update && apt install --no-install-recommends -y build-essential git &&
     make defconfig && make
 
 FROM debian:bookworm-slim
+COPY --from=builder /tmp/busybox /bin/busybox
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-debian"
 
@@ -29,7 +30,6 @@ ENV \
 
 COPY ./overlay /
 COPY ./12/overlay /
-COPY --from=builder /tmp/busybox /bin/busybox
 
 RUN chmod +x ${BF_BIN}/bf-install && bf-install
 

diff --git a/Dockerfile.esh b/Dockerfile.esh
@@ -7,6 +7,7 @@ RUN apt update && apt install --no-install-recommends -y build-essential git &&
     make defconfig && make
 
 FROM debian:<%= ${DEBIAN_MINOR} %>-slim
+COPY --from=builder /tmp/busybox /bin/busybox
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-debian"
 
@@ -29,7 +30,6 @@ ENV \
 
 COPY ./overlay /
 COPY ./<%= ${DEBIAN_VERSION} %>/overlay /
-COPY --from=builder /tmp/busybox /bin/busybox
 
 RUN chmod +x ${BF_BIN}/bf-install && bf-install
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/overlay/tmp/install b/overlay/tmp/install
@@ -16,16 +16,3 @@ busybox --install
 #======================================================================================================================
 
 bf-tz "Europe/London"
-
-
-#======================================================================================================================
-# Cleanup.
-#======================================================================================================================
-
-bf-echo "Removing .empty files..."
-rm /.empty
-rm /etc/bf/init.d/.empty
-rm /etc/bf/src/.empty
-rm /etc/bf/templates/.empty
-rm /usr/lib/bf/inc/.empty
-bf-done
diff --git a/overlay/usr/bin/bf/bf-clear b/overlay/usr/bin/bf/bf-clear
@@ -14,4 +14,7 @@ bf-debug "Clearing caches..." "bf-clear"
 rm -rf /var/lib/apt/lists/*
 rm -rf /var/cache/*
 
+bf-debug "Removing .empty files..."
+find / -type f -name ".empty" -delete
+
 bf-debug "Done." "bf-clear"
diff --git a/sid/Dockerfile b/sid/Dockerfile
@@ -7,6 +7,7 @@ RUN apt update && apt install --no-install-recommends -y build-essential git &&
     make defconfig && make
 
 FROM debian:sid-slim
+COPY --from=builder /tmp/busybox /bin/busybox
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-debian"
 
@@ -29,7 +30,6 @@ ENV \
 
 COPY ./overlay /
 COPY ./sid/overlay /
-COPY --from=builder /tmp/busybox /bin/busybox
 
 RUN chmod +x ${BF_BIN}/bf-install && bf-install