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.
cnpem · Dec 3, 2024 · f72ee54 · f72ee54
1 parent fce6105
commit f72ee54
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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