Fix broken dockerfile path in container build script

rackerlabs · Sep 11, 2024 · 51a3372 · 51a3372
1 parent 92e4c91
commit 51a3372
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml
@@ -99,7 +99,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: "{{defaultContext}}:containers/dnsmasq"
-          file: containers/dnsmasq/Dockerfile.dnsmasq
+          file: Dockerfile.dnsmasq
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/containers/dnsmasq/Dockerfile.dnsmasq b/containers/dnsmasq/Dockerfile.dnsmasq
@@ -22,7 +22,7 @@ RUN apt-get -y build-dep dnsmasq
 RUN apt-get -y source dnsmasq
 WORKDIR /src/dnsmasq-2.89
 RUN mkdir -p debian/patches
-COPY containers/dnsmasq/dhcp-allowed-srvids.patch /src/dnsmasq-2.89/debian/patches/
+COPY dnsmasq/dhcp-allowed-srvids.patch /src/dnsmasq-2.89/debian/patches/
 RUN echo dhcp-allowed-srvids.patch > debian/patches/series
 RUN quilt push -a
 RUN dch -v 2.89-2 "patched for dhcp-allowed-srvids"
@@ -42,10 +42,10 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/*.deb
 
-COPY containers/dnsmasq/common/helpers.sh /helpers.sh
-COPY containers/dnsmasq/entry-point.sh /entry-point.sh
+COPY common/helpers.sh /helpers.sh
+COPY dnsmasq/entry-point.sh /entry-point.sh
 RUN chmod +x /entry-point.sh
-COPY containers/dnsmasq/dnsmasq.conf.j2 /etc/dnsmasq.conf.j2
+COPY dnsmasq/dnsmasq.conf.j2 /etc/dnsmasq.conf.j2
 # let our entry point write out the script
 RUN ln -sf /etc/dnsmasq.d/dnsmasq.conf /etc/dnsmasq.conf