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 2021/03/01 07:02:10 UTC
[incubator-tuweni] branch master updated: Use one docker image for
all of Tuweni
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 f98c5b3 Use one docker image for all of Tuweni
new ddee515 Merge pull request #197 from atoulme/one_docker_image
f98c5b3 is described below
commit f98c5b3abd2a55ee2a5789130ef3a9bea35c3fb9
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sun Feb 28 18:36:56 2021 -0800
Use one docker image for all of Tuweni
---
dist/build.gradle | 16 ++++++----------
dist/docker/relayer.Dockerfile | 19 -------------------
dist/docker/{gossip.Dockerfile => tuweni.Dockerfile} | 12 ++++++++----
3 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/dist/build.gradle b/dist/build.gradle
index 59fe5b9..b0d380c 100644
--- a/dist/build.gradle
+++ b/dist/build.gradle
@@ -14,7 +14,7 @@
import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
import org.gradle.crypto.checksum.Checksum
-plugins { id 'com.bmuschko.docker-remote-api' version '3.2.3' }
+plugins { id 'com.bmuschko.docker-remote-api' version '6.7.0' }
description = 'Tuweni distribution.'
@@ -224,19 +224,15 @@ task createChecksums(type: Checksum, dependsOn: [
build.dependsOn('createChecksums')
-task buildGossipImage(type: DockerBuildImage) {
+task buildBinImage(type: DockerBuildImage) {
dependsOn distTar
inputDir = projectDir
- dockerFile = file("docker/gossip.Dockerfile")
- tag = "apache-tuweni/gossip:$project.version"
+ dockerFile = file("docker/tuweni.Dockerfile")
+ images = [
+ "apache-tuweni/tuweni:$project.version"
+ ]
}
-task buildRelayerImage(type: DockerBuildImage) {
- dependsOn distTar
- inputDir = projectDir
- dockerFile = file("docker/relayer.Dockerfile")
- tag = "apache-tuweni/relayer:$project.version"
-}
integrationTest.dependsOn build
dependencies {
diff --git a/dist/docker/relayer.Dockerfile b/dist/docker/relayer.Dockerfile
deleted file mode 100644
index 6791c16..0000000
--- a/dist/docker/relayer.Dockerfile
+++ /dev/null
@@ -1,19 +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.
-
-FROM openjdk:11.0.3-jre-stretch
-
-COPY build/distributions/tuweni-bin-*.tgz /usr/relayer.tgz
-RUN cd /usr \
- && tar xzf relayer.tgz \
- && mv tuweni-relayer-*/relayer relayer
-
-ENTRYPOINT ["/usr/relayer/bin/relayer"]
\ No newline at end of file
diff --git a/dist/docker/gossip.Dockerfile b/dist/docker/tuweni.Dockerfile
similarity index 75%
rename from dist/docker/gossip.Dockerfile
rename to dist/docker/tuweni.Dockerfile
index e6558db..13ea074 100644
--- a/dist/docker/gossip.Dockerfile
+++ b/dist/docker/tuweni.Dockerfile
@@ -11,9 +11,13 @@
FROM openjdk:11.0.3-jre-stretch
-COPY build/distributions/tuweni-bin-*.tgz /usr/gossip.tgz
+RUN apt-get update && apt-get install -y libsodium-dev
+
+COPY build/distributions/tuweni-bin-*.tgz /usr/tuweni.tgz
RUN cd /usr \
- && tar xzf gossip.tgz \
- && mv tuweni-bin-*/gossip gossip
+ && tar xzf tuweni.tgz \
+ && mv /usr/tuweni-bin-* /usr/tuweni \
+ && rm tuweni.tgz
-ENTRYPOINT ["/usr/gossip/bin/gossip"]
\ No newline at end of file
+WORKDIR "/usr/tuweni/bin"
+ENTRYPOINT ["/usr/tuweni/bin/tuweni"]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org