From 99ceecb4e1aa02ec4153484e1bfadba891bc028f Mon Sep 17 00:00:00 2001 From: Steve Keay Date: Wed, 11 Sep 2024 10:36:22 +0100 Subject: [PATCH] Fix up Dockerfiles to reflect change to container directory structure --- containers/dnsmasq/Dockerfile.dnsmasq | 2 +- containers/obm-utils/Dockerfile.obm_utils | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/dnsmasq/Dockerfile.dnsmasq b/containers/dnsmasq/Dockerfile.dnsmasq index 3e011417..e0af1170 100644 --- a/containers/dnsmasq/Dockerfile.dnsmasq +++ b/containers/dnsmasq/Dockerfile.dnsmasq @@ -42,7 +42,7 @@ RUN apt-get update && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/*.deb -COPY containers/common/helpers.sh /helpers.sh +COPY containers/dnsmasq/common/helpers.sh /helpers.sh COPY containers/dnsmasq/entry-point.sh /entry-point.sh RUN chmod +x /entry-point.sh COPY containers/dnsmasq/dnsmasq.conf.j2 /etc/dnsmasq.conf.j2 diff --git a/containers/obm-utils/Dockerfile.obm_utils b/containers/obm-utils/Dockerfile.obm_utils index 2b1c0a6c..228d1fe5 100644 --- a/containers/obm-utils/Dockerfile.obm_utils +++ b/containers/obm-utils/Dockerfile.obm_utils @@ -8,7 +8,7 @@ ARG APP_GROUP=appgroup ARG APP_USER_UID=1000 ARG APP_GROUP_GID=1000 -COPY --chown=${APP_USER}:${APP_GROUP} containers/requirements.txt /app +COPY --chown=${APP_USER}:${APP_GROUP} requirements.txt /app RUN --mount=type=cache,target=/root/.cache/.pip pip install --no-cache-dir -r /app/requirements.txt FROM ${BASE} as prod