This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch sebb-docker
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/sebb-docker by this push:
new 0caf57d Keep Docker files together; add some docn
0caf57d is described below
commit 0caf57deb0ca4a879a981efafe5cd445065d3854
Author: Sebb <s...@apache.org>
AuthorDate: Fri Jun 17 11:33:35 2022 +0100
Keep Docker files together; add some docn
---
src/docker/Dockerfile | 2 ++
src/docker/README.md | 14 ++++++++++++--
build.sh => src/docker/build.sh | 0
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index 3e01a5d..a6c529d 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -48,9 +48,11 @@ RUN dpkg --add-architecture i386 && apt-get update \
&& apt-get --assume-yes install gcc-arm-linux-gnueabihf \
&& apt-get --assume-yes install g++-arm-linux-gnueabihf
+# Do this separately to make upgrades easier
RUN wget
https://dlcdn.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
\
&& tar xf apache-maven-*.tar.gz -C /opt && ln -s /opt/apache-maven-3.6.3
/opt/maven
+# Ensure we are in the correct directory (this will be overlaid by the virtual
mount)
WORKDIR /home/crypto
CMD /bin/bash
diff --git a/src/docker/README.md b/src/docker/README.md
index 15f3784..bc57624 100644
--- a/src/docker/README.md
+++ b/src/docker/README.md
@@ -15,6 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+# About
+
+This directory contains scripts needed to build Crypto native code using a
Docker image.
+
+The Docker image runs on Ubuntu and includes Maven and cross-compilation tools
+which are used to build Linux and Windows native code files (see build.sh for
the list).
+The image uses virtual mounts for the source code and Maven repository, so the
output
+of the build is available on the host system and can be included in a
subsequent release
+build.
# Building with Docker
```
@@ -26,7 +36,7 @@
```
cd src/docker
- docker compose run crypto # run shell
+ docker compose run crypto # run shell; can then use Maven to do builds
OR
- docker compose run --entrypoint ./build.sh crypto # run build
+ docker compose run --entrypoint src/docker/build.sh crypto # run full build
```
\ No newline at end of file
diff --git a/build.sh b/src/docker/build.sh
similarity index 100%
rename from build.sh
rename to src/docker/build.sh
