Skip to content

Commit 93c2f07

Browse files
committed
Regular use of variables
1 parent 17c0545 commit 93c2f07

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

dockerfiles/artdaq-spack.dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ ARG BASE_IMAGE=eflumerf/alma9-spack:latest
66
ARG SPACK_VERSION=v0.28
77
ARG SCRIPT_NAME=quick-spack-start_${SPACK_VERSION}.sh
88

9-
FROM $BASE_IMAGE AS intermediate
9+
FROM ${BASE_IMAGE} AS intermediate
1010

1111
SHELL ["/bin/bash", "-c"]
1212

1313
WORKDIR /opt/artdaq
1414

15-
ADD https://raw.githubusercontent.com/art-daq/artdaq_demo/develop/tools/$SCRIPT_NAME /opt/artdaq/$SCRIPT_NAME
15+
ADD https://raw.githubusercontent.com/art-daq/artdaq_demo/develop/tools/${SCRIPT_NAME} /opt/artdaq/${SCRIPT_NAME}
1616

17-
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/$ART_AREA
18-
COPY spack_${SPACK_VERSION}/$ART_AREA /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/$ART_AREA
17+
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/${ART_AREA}
18+
COPY spack_${SPACK_VERSION}/${ART_AREA} /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/${ART_AREA}
1919

20-
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/$ARTDAQ_AREA
21-
COPY spack_${SPACK_VERSION}/$ARTDAQ_AREA /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/$ARTDAQ_AREA
20+
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/${ARTDAQ_AREA}
21+
COPY spack_${SPACK_VERSION}/${ARTDAQ_AREA} /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/${ARTDAQ_AREA}
2222

23-
RUN chmod +x /opt/artdaq/$SCRIPT_NAME && \
24-
./$SCRIPT_NAME --develop --dev-only --no-kmod --arch linux-almalinux9-x86_64_v3 \
25-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/$ARTDAQ_AREA \
26-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/$ART_AREA
23+
RUN chmod +x /opt/artdaq/${SCRIPT_NAME} && \
24+
./${SCRIPT_NAME} --develop --dev-only --no-kmod --arch linux-almalinux9-x86_64_v3 \
25+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/${ARTDAQ_AREA} \
26+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${SPACK_VERSION}/$[ART_AREA}
2727

2828
# Create artdaq_demo_rte.sh
2929
RUN source setupARTDAQDEMO && spack clean -a

0 commit comments

Comments
 (0)