twoliter: embed .dockerignore

The build system has very specific requirements on what to include in the Docker build context in order to work as expected. Embedding the file avoids the need for a synchronized change in other projects when updating Twoliter. Signed-off-by: Ben Cressey <[email protected]>
bottlerocket-os · Dec 7, 2023 · 8658a7f · 8658a7f
1 parent 7d38b08
commit 8658a7f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/twoliter/build.rs b/twoliter/build.rs
@@ -26,6 +26,7 @@ fn main() {
     ));
 
     paths.copy_file("Dockerfile");
+    paths.copy_file("Dockerfile.dockerignore");
     paths.copy_file("Makefile.toml");
     paths.copy_file("docker-go");
     paths.copy_file("partyplanner");

diff --git a/twoliter/embedded/Dockerfile b/twoliter/embedded/Dockerfile
@@ -31,7 +31,7 @@ ARG TOKEN
 # We can't create directories via RUN in a scratch container, so take an existing one.
 COPY --chown=1000:1000 --from=sdk /tmp /cache
 # Ensure the ARG variables are used in the layer to prevent reuse by other builds.
-COPY --chown=1000:1000 .dockerignore /cache/.${PACKAGE}.${ARCH}.${TOKEN}
+COPY --chown=1000:1000 .gitignore /cache/.${PACKAGE}.${ARCH}.${TOKEN}
 
 # =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=
 # Some builds need to modify files in the source directory, for example Rust software using
@@ -52,7 +52,7 @@ ARG TOKEN
 # We can't create directories via RUN in a scratch container, so take an existing one.
 COPY --chown=1000:1000 --from=sdk /tmp /variantcache
 # Ensure the ARG variables are used in the layer to prevent reuse by other builds.
-COPY --chown=1000:1000 .dockerignore /variantcache/.${PACKAGE}.${ARCH}.${VARIANT}.${TOKEN}
+COPY --chown=1000:1000 .gitignore /variantcache/.${PACKAGE}.${ARCH}.${VARIANT}.${TOKEN}
 
 # =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=
 # Builds an RPM package from a spec file.

diff --git a/twoliter/embedded/Dockerfile.dockerignore b/twoliter/embedded/Dockerfile.dockerignore
@@ -0,0 +1,12 @@
+/.git
+/.gomodcache
+/build/*
+!/build/rpms/
+/build/rpms/*
+!/build/rpms/*.rpm
+/build/rpms/*-debuginfo-*.rpm
+/build/rpms/*-debugsource-*.rpm
+!/build/tools/*
+**/target/*
+/sbkeys
+/tests