Fix gathering

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
spiffe · Jan 22, 2025 · a1394f8 · a1394f8
1 parent 7e567c6
commit a1394f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml
@@ -40,8 +40,7 @@ jobs:
           set -xe
           echo "building: {{github.ref_name}}-$(uname -i)"
           docker build -t t examples/rpms
-          mkdir -p /tmp/packages
-          docker run -i --rm -v /tmp:/tmp t cp -a '/usr/share/nginx/html/*' /tmp/packages
+          docker run -i --rm -v /tmp:/tmp t /bin/bash -c 'cp -a /usr/share/nginx/html/packages /tmp'
       - name: Archive artifacts
         uses: actions/upload-artifact@v4
         with:

diff --git a/examples/rpms/Dockerfile b/examples/rpms/Dockerfile
@@ -22,11 +22,13 @@ RUN \
   apt-get install -y alien && \
   mkdir -p /root/debbuild && \
   cd /root/debbuild && \
+  mkdir $(dpkg --print-architecture) && \
+  cd * && \
   alien -k -c --to-deb /root/rpmbuild/RPMS/*/*.rpm
 
 RUN \
-  apt-get install -y /root/debbuild/*.deb
+  apt-get install -y /root/debbuild/*/*.deb
 
 FROM docker.io/library/nginx:latest
-COPY --from=rpm-builder /root/rpmbuild/RPMS /usr/share/nginx/html/RPMS
-COPY --from=deb-builder /root/debbuild /usr/share/nginx/html/DEBS
+COPY --from=rpm-builder /root/rpmbuild/RPMS /usr/share/nginx/html/packages/RPMS
+COPY --from=deb-builder /root/debbuild /usr/share/nginx/html/packages/DEBS