You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2020/05/10 04:54:42 UTC
[incubator-tuweni] branch master updated: Simplify and document
build procedure
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
The following commit(s) were added to refs/heads/master by this push:
new cee2b23 Simplify and document build procedure
cee2b23 is described below
commit cee2b23bb40963b7c461d09ec6a527e81a72b1ac
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sat May 9 21:54:16 2020 -0700
Simplify and document build procedure
---
build.sh | 6 ++++--
gradle/build.Dockerfile | 2 ++
gradle/docker/docker-compose.yml | 22 ----------------------
gradle/docker/test.Dockerfile | 2 ++
4 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/build.sh b/build.sh
index fb73b54..a4a9fc8 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,8 @@
# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
-cd gradle/docker
+pushd gradle/docker
docker build -t tuweni_test -f test.Dockerfile ../..
-docker-compose up
\ No newline at end of file
+popd
+docker run tuweni_test bash -c 'gradle --version >> /dev/null && gradle -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" test'
+docker run -v `pwd`/build/libs:/home/gradle/build/libs tuweni_test bash -c 'gradle --version >> /dev/null && gradle -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetcaspaceSize=512m" assemble integrationTest -x test'
\ No newline at end of file
diff --git a/gradle/build.Dockerfile b/gradle/build.Dockerfile
index 9a317ab..358d45c 100644
--- a/gradle/build.Dockerfile
+++ b/gradle/build.Dockerfile
@@ -8,6 +8,8 @@
# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
+
+# Build image used for github actions
FROM gradle:6.3-jdk11
RUN apt-get update && apt-get install -y libsodium-dev && apt-get clean
\ No newline at end of file
diff --git a/gradle/docker/docker-compose.yml b/gradle/docker/docker-compose.yml
deleted file mode 100644
index 67c5684..0000000
--- a/gradle/docker/docker-compose.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
-# file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
-# to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-version: "3.6"
-services:
- test:
- container_name: test
- image: tuweni_test
- volumes:
- - ../../build/libs:/home/gradle/build/libs
- command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false assemble test
- integration-test:
- container_name: integration-test
- image: tuweni_test
- command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false integrationTest -x test
\ No newline at end of file
diff --git a/gradle/docker/test.Dockerfile b/gradle/docker/test.Dockerfile
index 1f867c7..8366fe4 100644
--- a/gradle/docker/test.Dockerfile
+++ b/gradle/docker/test.Dockerfile
@@ -8,6 +8,8 @@
# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
+
+# Image used for local testing
FROM gradle:6.3-jdk11
RUN apt-get update && apt-get install -y libsodium-dev && apt-get clean
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org