Merge pull request #2123 from WadeBarnes/fix/image-builds

Fix ACA-py image builds
openwallet-foundation · Feb 15, 2023 · 73f4f46 · 73f4f46
2 parents 467104f + 3d60b9b
commit 73f4f46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -87,7 +87,11 @@ RUN chmod -R ug+rw $HOME/log $HOME/ledger $HOME/.aries_cloudagent $HOME/.cache
 
 COPY --from=build /src/dist/aries_cloudagent*.whl .
 
-RUN pip install --no-cache-dir --find-links=. aries_cloudagent${acapy_reqs} && rm aries_cloudagent*.whl
+# Install ACA-py from the wheel.
+RUN aries_cloudagent_package=$(find ./ -name "aries_cloudagent*.whl" | head -n 1) && \
+    echo "Installing ${aries_cloudagent_package} ..." && \
+    pip install --no-cache-dir --find-links=. ${aries_cloudagent_package}${acapy_reqs} && \
+    rm aries_cloudagent*.whl
 
 # Clean-up unneccessary build dependencies and reduce final image size
 RUN apt-get purge -y --auto-remove build-essential

diff --git a/docker/Dockerfile.indy b/docker/Dockerfile.indy
@@ -256,7 +256,11 @@ RUN chmod -R ug+rw $HOME/.aries_cloudagent
 
 COPY --from=acapy-builder /src/dist/aries_cloudagent*.whl .
 
-RUN pip install --no-cache-dir --find-links=. aries_cloudagent${acapy_reqs} && rm aries_cloudagent*.whl
+# Install ACA-py from the wheel.
+RUN aries_cloudagent_package=$(find ./ -name "aries_cloudagent*.whl" | head -n 1) && \
+    echo "Installing ${aries_cloudagent_package} ..." && \
+    pip install --no-cache-dir --find-links=. ${aries_cloudagent_package}${acapy_reqs} && \
+    rm aries_cloudagent*.whl
 
 # Clean-up unneccessary build dependencies and reduce final image size
 # RUN apt-get purge -y --auto-remove build-essential