Skip to content

Commit bca3cfd

Browse files
authored
Merge branch 'main' into delete-tail-files
2 parents 3eba909 + 73f4f46 commit bca3cfd

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

docker/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ RUN chmod -R ug+rw $HOME/log $HOME/ledger $HOME/.aries_cloudagent $HOME/.cache
8787

8888
COPY --from=build /src/dist/aries_cloudagent*.whl .
8989

90-
RUN pip install --no-cache-dir --find-links=. aries_cloudagent${acapy_reqs} && rm aries_cloudagent*.whl
90+
# Install ACA-py from the wheel.
91+
RUN aries_cloudagent_package=$(find ./ -name "aries_cloudagent*.whl" | head -n 1) && \
92+
echo "Installing ${aries_cloudagent_package} ..." && \
93+
pip install --no-cache-dir --find-links=. ${aries_cloudagent_package}${acapy_reqs} && \
94+
rm aries_cloudagent*.whl
9195

9296
# Clean-up unneccessary build dependencies and reduce final image size
9397
RUN apt-get purge -y --auto-remove build-essential

docker/Dockerfile.indy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,11 @@ RUN chmod -R ug+rw $HOME/.aries_cloudagent
256256

257257
COPY --from=acapy-builder /src/dist/aries_cloudagent*.whl .
258258

259-
RUN pip install --no-cache-dir --find-links=. aries_cloudagent${acapy_reqs} && rm aries_cloudagent*.whl
259+
# Install ACA-py from the wheel.
260+
RUN aries_cloudagent_package=$(find ./ -name "aries_cloudagent*.whl" | head -n 1) && \
261+
echo "Installing ${aries_cloudagent_package} ..." && \
262+
pip install --no-cache-dir --find-links=. ${aries_cloudagent_package}${acapy_reqs} && \
263+
rm aries_cloudagent*.whl
260264

261265
# Clean-up unneccessary build dependencies and reduce final image size
262266
# RUN apt-get purge -y --auto-remove build-essential

0 commit comments

Comments
 (0)