activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [activemq-artemis-native] branch master updated: NO-JIRA Moving docker-file under src/main/docker
Date Thu, 28 Feb 2019 19:18:26 GMT
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis-native.git


The following commit(s) were added to refs/heads/master by this push:
     new 0dd5c10  NO-JIRA Moving docker-file under src/main/docker
0dd5c10 is described below

commit 0dd5c10fcd80005805f6eba4e82b095720a250d5
Author: Clebert Suconic <clebertsuconic@apache.org>
AuthorDate: Thu Feb 28 14:18:18 2019 -0500

    NO-JIRA Moving docker-file under src/main/docker
---
 README.md                                              | 2 +-
 scripts/32test.sh                                      | 2 +-
 scripts/64test.sh                                      | 4 ++--
 scripts/compile-using-docker.sh                        | 8 ++++----
 {docker-build => src/main/docker}/Dockerfile-centos    | 0
 {docker-build => src/main/docker}/Dockerfile-ubuntu    | 0
 {docker-build => src/main/docker}/Dockerfile-ubuntu-32 | 0
 {docker-build => src/main/docker}/README.md            | 0
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index d3661a9..6b7fac0 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Mailing List:    linux-aio@kvack.org
 
 From the project base directory, run:
 
-```docker build -f docker-build/Dockerfile-centos -t artemis-native-builder . &&
docker run -v $PWD/target/bin:/work/bin artemis-native-builder && sudo chown -Rv $USER:$GID
target/bin```
+```docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder . &&
docker run -v $PWD/target/bin:/work/bin artemis-native-builder && sudo chown -Rv $USER:$GID
target/bin```
 
 
 ## Steps to build (manual)
diff --git a/scripts/32test.sh b/scripts/32test.sh
index 220075c..fb1e3f5 100755
--- a/scripts/32test.sh
+++ b/scripts/32test.sh
@@ -18,7 +18,7 @@
 
 # This will generate a 32bit image for testing and start the shell
 
-docker build -f docker-build/Dockerfile-ubuntu-32 -t artemis-native-builder-32 .
+docker build -f src/main/docker/Dockerfile-ubuntu-32 -t artemis-native-builder-32 .
 # This is mapping your maven repository inside the image to avoid you downloading the internet
again
 docker run -it --rm -v $PWD/bin:/work/bin -v $HOME/.m2/repository/:/root/.m2/repository artemis-native-builder-32
./mvnw test
 
diff --git a/scripts/64test.sh b/scripts/64test.sh
index 25b84f9..ca8a1be 100755
--- a/scripts/64test.sh
+++ b/scripts/64test.sh
@@ -18,10 +18,10 @@
 
 # This will generate a 32bit image for testing and start the shell
 
-docker build -f docker-build/Dockerfile-centos -t artemis-native-builder .
+docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
 
 # This is mapping your maven repository inside the image to avoid you downloading the internet
again
 docker run -it --rm -v $PWD/bin:/work/bin -v $HOME/.m2/repository/:/root/.m2/repository artemis-native-builder
./mvnw test
 
 # you could use it this way
-#docker build -f docker-build/Dockerfile-centos -t artemis-native-builder . && docker
run -it --rm -v $PWD/bin:/work/bin -v $HOME/.m2/repository/:/root/.m2/repository artemis-native-builder
bash
+#docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder . &&
docker run -it --rm -v $PWD/bin:/work/bin -v $HOME/.m2/repository/:/root/.m2/repository artemis-native-builder
bash
diff --git a/scripts/compile-using-docker.sh b/scripts/compile-using-docker.sh
index d19494e..718716f 100755
--- a/scripts/compile-using-docker.sh
+++ b/scripts/compile-using-docker.sh
@@ -16,17 +16,17 @@
 # under the License.
 
 rm -rf ./bin/*so
-docker build -f docker-build/Dockerfile-centos -t artemis-native-builder . 
+docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
 docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder "$@"
 chown -Rv $USER:$GID ./bin
 
 # Note: You may need to authorize docker to map folder at your folder structure
-#docker build -f docker-build/Dockerfile-centos -t artemis-native-builder . && docker
run -it --rm -v $PWD/bin:/work/bin artemis-native-builder bash
+#docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder . &&
docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder bash
 
 
 ## 64 bits build
 #docker image rm artemis-native-builder -f
-#docker build -f ./docker-build/Dockerfile-ubuntu -t artemis-native-builder .
+#docker build -f ./src/main/docker/Dockerfile-ubuntu -t artemis-native-builder .
 
 # Note: You may need to authorize docker to map folder at your folder structure
 #docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder bash ./compile-native.sh
@@ -35,7 +35,7 @@ chown -Rv $USER:$GID ./bin
 #docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder bash
 
 #docker image rm artemis-native-builder-32 -f
-#docker build -f ./docker-build/Dockerfile-ubuntu-32 -t artemis-native-builder-32 .
+#docker build -f ./src/main/docker/Dockerfile-ubuntu-32 -t artemis-native-builder-32 .
 
 # Note: You may need to authorize docker to map folder at your folder structure
 #docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder-32 bash ./compile-native.sh
diff --git a/docker-build/Dockerfile-centos b/src/main/docker/Dockerfile-centos
similarity index 100%
rename from docker-build/Dockerfile-centos
rename to src/main/docker/Dockerfile-centos
diff --git a/docker-build/Dockerfile-ubuntu b/src/main/docker/Dockerfile-ubuntu
similarity index 100%
rename from docker-build/Dockerfile-ubuntu
rename to src/main/docker/Dockerfile-ubuntu
diff --git a/docker-build/Dockerfile-ubuntu-32 b/src/main/docker/Dockerfile-ubuntu-32
similarity index 100%
rename from docker-build/Dockerfile-ubuntu-32
rename to src/main/docker/Dockerfile-ubuntu-32
diff --git a/docker-build/README.md b/src/main/docker/README.md
similarity index 100%
rename from docker-build/README.md
rename to src/main/docker/README.md


Mime
View raw message