Skip to content

Commit c42df5a

Browse files
committed
up docker image
1 parent 193fbb9 commit c42df5a

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

feelpp-testsuite/Dockerfile.template

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ARG CONFIGURE_FLAGS="-r"
77
ARG CMAKE_FLAGS=""
88
ARG CTEST_FLAGS="-T test --no-compress-output"
99
ARG BUILDKITE_JOB_ID=""
10+
ARG FEELPP_GIRDER_API_KEY=""
11+
ARG FEELPP_GITHUB_TOKEN=""
1012
ARG BUILDKITE_AGENT_ACCESS_TOKEN=""
1113
ARG BUILDKITE_AGENT_ENDPOINT="https://agent.buildkite.com/v3"
1214
ARG CXX=g++
@@ -16,12 +18,9 @@ USER feelpp
1618
ENV HOME /home/feelpp
1719

1820
# Install Feel++
19-
RUN \
20-
--mount=type=secret,id=FEELPP_GITHUB_TOKEN,dst=/run/secrets/FEELPP_GITHUB_TOKEN \
21-
--mount=type=secret,id=FEELPP_GIRDER_API_KEY,dst=/run/secrets/FEELPP_GIRDER_API_KEY \
22-
bash -c "\
23-
export FEELPP_GITHUB_TOKEN=$(cat /run/secrets/FEELPP_GITHUB_TOKEN) && \
24-
export FEELPP_GIRDER_API_KEY=$(cat /run/secrets/FEELPP_GIRDER_API_KEY) && \
21+
RUN bash -c "\
22+
export FEELPP_GITHUB_TOKEN=${FEELPP_GITHUB_TOKEN} && \
23+
export FEELPP_GIRDER_API_KEY=${FEELPP_GIRDER_API_KEY} && \
2524
source $HOME/feelpp.conf.sh && \
2625
install_test_feelpp_module_nofail ${BRANCH} testsuite $HOME/src/feelpp/testsuite \"${BUILD_JOBS}\" \"${CONFIGURE_FLAGS}\" \"${CTEST_FLAGS}\" \"${CMAKE_FLAGS}\" && \
2726
clean_feelpp_cpp_o"

feelpp/Dockerfile.template

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ ARG CMAKE_FLAGS=""
88
ARG CTEST_FLAGS="-T test --no-compress-output"
99
ARG BUILDKITE_JOB_ID=""
1010
ARG BUILDKITE_AGENT_ACCESS_TOKEN=""
11+
ARG FEELPP_GIRDER_API_KEY=""
12+
ARG FEELPP_GITHUB_TOKEN=""
1113
ARG BUILDKITE_AGENT_ENDPOINT="https://agent.buildkite.com/v3"
1214
ARG CXX=g++
1315
ARG CC=gcc
@@ -19,12 +21,9 @@ COPY feelppconfig $HOME/.feelppconfig
1921

2022
# Install Feel++cp ../fee
2123
COPY feelpp.conf.sh /home/feelpp
22-
RUN \
23-
--mount=type=secret,id=FEELPP_GITHUB_TOKEN,dst=/run/secrets/FEELPP_GITHUB_TOKEN \
24-
--mount=type=secret,id=FEELPP_GIRDER_API_KEY,dst=/run/secrets/FEELPP_GIRDER_API_KEY \
25-
bash -c "\
26-
export FEELPP_GITHUB_TOKEN=$(cat /run/secrets/FEELPP_GITHUB_TOKEN) && \
27-
export FEELPP_GIRDER_API_KEY=$(cat /run/secrets/FEELPP_GIRDER_API_KEY) && \
24+
RUN bash -c "\
25+
export FEELPP_GITHUB_TOKEN=${FEELPP_GITHUB_TOKEN} && \
26+
export FEELPP_GIRDER_API_KEY=${FEELPP_GIRDER_API_KEY} && \
2827
source $HOME/feelpp.conf.sh && \
2928
install_feelpp_module ${BRANCH} feelpp $HOME/src/feelpp/ ${BUILD_JOBS} \"${CONFIGURE_FLAGS}\" \"${CTEST_FLAGS}\" \"${CMAKE_FLAGS}\""
3029

0 commit comments

Comments
 (0)