From f72ee54914ddb94e6d08fbdfa848eeec134879d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 3 Dec 2024 17:33:40 -0300 Subject: [PATCH] base: don't store RELEASE in /opt/epics. Also switch to using $EPICS_RELEASE_PATH where relevant so they don't have to care about the specific location. --- Dockerfile | 2 +- base/Dockerfile | 2 +- base/lnls-build-static-ioc.sh | 2 +- base/musl/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd31b90..7e38f60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ WORKDIR /opt/${REPONAME} COPY . . -RUN cp /opt/epics/RELEASE configure/RELEASE +RUN cp $EPICS_RELEASE_FILE configure/RELEASE RUN rm -rf .git/ diff --git a/base/Dockerfile b/base/Dockerfile index ade48c1..11cf7ff 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -42,7 +42,7 @@ COPY install-functions.sh $EPICS_IN_DOCKER ENV EPICS_BASE_PATH /opt/epics/base ENV EPICS_MODULES_PATH /opt/epics/modules -ENV EPICS_RELEASE_FILE /opt/epics/RELEASE +ENV EPICS_RELEASE_FILE $EPICS_IN_DOCKER/RELEASE WORKDIR /opt/epics diff --git a/base/lnls-build-static-ioc.sh b/base/lnls-build-static-ioc.sh index 266ca54..6261d60 100755 --- a/base/lnls-build-static-ioc.sh +++ b/base/lnls-build-static-ioc.sh @@ -22,7 +22,7 @@ restore_configure() { trap restore_configure EXIT echo "overwriting configure/ files..." -cp /opt/epics/RELEASE configure/ +cp $EPICS_RELEASE_FILE configure/ cat << "EOF" > configure/CONFIG_SITE.local STATIC_BUILD=YES FULL_STATIC_BUILD=YES diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index af07724..4a8e23f 100644 --- a/base/musl/Dockerfile +++ b/base/musl/Dockerfile @@ -43,7 +43,7 @@ COPY install-functions.sh $EPICS_IN_DOCKER ENV EPICS_BASE_PATH /opt/epics/base ENV EPICS_MODULES_PATH /opt/epics/modules -ENV EPICS_RELEASE_FILE /opt/epics/RELEASE +ENV EPICS_RELEASE_FILE $EPICS_IN_DOCKER/RELEASE WORKDIR /opt/epics