More updates for building inside docker image

.dockerignore

@@ -0,0 +1,7 @@
+# add git-ignore syntax here of things you don't want copied into docker image
+.git
+*Dockerfile*
+*docker-compose*
+node_modules
+*target*
+*.class

Dockerfile

@@ -4,38 +4,30 @@ MAINTAINER [email protected]
 # Set up the private repo first
 WORKDIR /home/jpo-ode-private
 
-COPY ./jpo-ode-private/pom.xml ./pom.xml
-COPY ./jpo-ode-private/j2735/pom.xml ./j2735/pom.xml
-COPY ./jpo-ode-private/ieee1609dot2/pom.xml ./ieee1609dot2/pom.xml
+COPY ./jpo-ode-private/pom.xml ./
+COPY ./jpo-ode-private/j2735/pom.xml ./j2735/
+COPY ./jpo-ode-private/j2735/src ./j2735/src
+COPY ./jpo-ode-private/ieee1609dot2/pom.xml ./ieee1609dot2/
+COPY ./jpo-ode-private/ieee1609dot2/src ./ieee1609dot2/src
 COPY ./jpo-ode-private/lib/*.jar ./lib/
 
-RUN mvn install:install-file -Dfile=./lib/LunaProvider.jar -DgroupId=com.safenet-inc -DartifactId=luna-provider -Dversion=6.2.2-4 -Dpackaging=jar
-RUN mvn install:install-file -Dfile=./lib/jprov_sfnt.jar -DgroupId=com.safenet-inc -DartifactId=safenet-provider -Dversion=5.4 -Dpackaging=jar
-RUN mvn install:install-file -Dfile=./lib/oss.jar -DgroupId=asn_1 -DartifactId=oss_soed -Dversion=6.3 -Dpackaging=jar
-RUN mvn install:install-file -Dfile=./lib/osslean.jar -DgroupId=asn_1 -DartifactId=oss_lean -Dversion=6.3 -Dpackaging=jar
-RUN mvn install:install-file -Dfile=./lib/osstoed.jar -DgroupId=asn_1 -DartifactId=oss_toed -Dversion=6.3 -Dpackaging=jar
-
-RUN mvn dependency:go-offline -B
-
-COPY ./jpo-ode-private .
-
 RUN mvn clean
 RUN mvn install -DskipTests
 
 # Now set up the public repo
 WORKDIR /home
 
-# COPY ./pom.xml ./pom.xml
-# COPY ./jpo-ode-core/pom.xml ./jpo-ode-core/pom.xml
-# COPY ./jpo-ode-svcs/pom.xml ./jpo-ode-svcs/pom.xml
-# COPY ./jpo-ode-plugins/pom.xml ./jpo-ode-plugins/pom.xml
-# COPY ./jpo-ode-common/pom.xml ./jpo-ode-common/pom.xml
-# COPY ./jpo-security/pom.xml ./jpo-security/pom.xml
-# COPY ./jpo-security-svcs/pom.xml ./jpo-security-svcs/pom.xml
-#
-# RUN mvn dependency:go-offline package -B
-
-COPY ./ ./
+COPY ./pom.xml ./
+COPY ./jpo-ode-core/pom.xml ./jpo-ode-core/
+COPY ./jpo-ode-core/src ./jpo-ode-core/src/
+COPY ./jpo-ode-svcs/pom.xml ./jpo-ode-svcs/
+COPY ./jpo-ode-svcs/src ./jpo-ode-svcs/src
+COPY ./jpo-ode-plugins/pom.xml ./jpo-ode-plugins/
+COPY ./jpo-ode-plugins/src ./jpo-ode-plugins/src
+COPY ./jpo-ode-common/pom.xml ./jpo-ode-common/
+COPY ./jpo-ode-common/src ./jpo-ode-common/src
+COPY ./jpo-security/pom.xml ./jpo-security/
+COPY ./jpo-security/src ./jpo-security/src
 
 RUN mvn clean install -DskipTests
 

build-and-deploy.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
-docker-compose up --build --no-recreate -d
+docker-compose down
+docker-compose up --build -d

build.cmd

@@ -1 +1 @@
-mvn cleancall docker-compose build
+call docker-compose build

build.sh

@@ -1,2 +1,2 @@
-mvn clean
+#!/bin/bash
 docker-compose build

clean-build-and-deploy-ppm-nsv.cmd

@@ -0,0 +1,3 @@
+call docker-compose down
+call docker-compose -f docker-compose-ppm-nsv.yml up --build -d
+call docker-compose ps

clean-build-and-deploy.cmd

@@ -1,5 +1,3 @@
-call docker-compose stop
-call docker-compose rm -f -v
-call mvn clean install -DskipTests
+call docker-compose down
 call docker-compose up --build -d
 call docker-compose ps

clean-build-and-deploy.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
-docker-compose stop
-docker-compose rm -f -v
-mvn clean install
-mvn --projects jpo-s3-deposit package assembly:single
+docker-compose down
 docker-compose up --build -d
 docker-compose ps

docker-run-adm.bat

@@ -1 +1 @@
-docker run -it -v %DOCKER_SHARED_VOLUME%:/asn1_codec_share -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -e ACM_CONFIG_FILE=adm.properties jpo-ode_acm:latest %1
+docker run -it --env-file=.env -v %DOCKER_SHARED_VOLUME%:/asn1_codec_share -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -e ACM_CONFIG_FILE=adm.properties jpoode_acm:latest %1

docker-run-aem.bat

@@ -1 +1 @@
-docker run -it -v %DOCKER_SHARED_VOLUME%:/asn1_codec_share -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -e ACM_CONFIG_FILE=aem.properties jpo-ode_acm:latest %1
+docker run -it --env-file=.env -v %DOCKER_SHARED_VOLUME%:/asn1_codec_share -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -e ACM_CONFIG_FILE=aem.properties jpoode_acm:latest %1

docker-run-depositor.bat

@@ -0,0 +1 @@
+docker run -it --env-file=.env jpoode_s3dep:latest %1

docker-run-ode.bat

@@ -1 +1 @@
-docker run -it -v %DOCKER_SHARED_VOLUME%:/ode_data -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -p "8080:8080" -p "9090:9090" -p "46753:46753/udp" jpo-ode_ode:latest %1
+docker run -it --env-file=.env -v %DOCKER_SHARED_VOLUME%:/ode_data -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -p "8080:8080" -p "9090:9090" -p "46753:46753/udp" jpoode_ode:latest %1

docker-run-ode.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -it -v /var/run/docker.sock:/var/run/docker.sock -v ${DOCKER_SHARED_VOLUME}:/ppm_data -p '8080:8080' -e DOCKER_HOST_IP=$DOCKER_HOST_IP jpo-ode_ode:latest $1
+docker run -it --env-file=.env -v /var/run/docker.sock:/var/run/docker.sock -v ${DOCKER_SHARED_VOLUME}:/ppm_data -p '8080:8080' -e DOCKER_HOST_IP=$DOCKER_HOST_IP jpoode_ode:latest $1

docker-run-ppm-env-file.bat

@@ -1 +1 @@
-docker run -it -v %DOCKER_SHARED_VOLUME%:/ppm_data --env-file=.env jpoode_ppm:latest %1
+docker run -it -v %DOCKER_SHARED_VOLUME%:/ppm_data --env-file=.env jpoode_ppm_tim:latest %1

docker-run-ppm.bat

@@ -1 +1 @@
-docker run -it -v %DOCKER_SHARED_VOLUME%:/ppm_data -e DOCKER_HOST_IP=%DOCKER_HOST_IP% jpo-ode_ppm:latest %1
+docker run -it --env-file=.env -v %DOCKER_SHARED_VOLUME%:/ppm_data -e DOCKER_HOST_IP=%DOCKER_HOST_IP% jpoode_ppm:latest %1

docker-run-ppm.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -it -v ${DOCKER_SHARED_VOLUME}:/ppm_data -e DOCKER_HOST_IP=${DOCKER_HOST_IP} jpo-ode_ppm:latest $1
+docker run -it --env-file=.env -v ${DOCKER_SHARED_VOLUME}:/ppm_data -e DOCKER_HOST_IP=${DOCKER_HOST_IP} jpoode_ppm:latest $1

pom.xml

@@ -16,14 +16,11 @@
  <version>0.0.1-SNAPSHOT</version>
  <packaging>pom</packaging>
  <modules>
- <module>jpo-ode-private</module>
  <module>jpo-ode-common</module>
  <module>jpo-ode-plugins</module>
  <module>jpo-ode-core</module>
  <module>jpo-ode-svcs</module>
  <module>jpo-security</module>
- <module>jpo-security-svcs</module>
- <module>jpo-s3-deposit</module>
  </modules>
 
  <repositories>

start-kafka-shell.bat

@@ -1 +1 @@
-docker run --rm -v /var/run/docker.sock:/var/run/docker.sock --env-file ./.env -it jpo-ode_kafka:latest /bin/bash
+docker run --rm -v /var/run/docker.sock:/var/run/docker.sock --env-file ./.env -it jpoode_kafka:latest /bin/bash

start-kafka-shell.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST_IP=${DOCKER_HOST_IP} -e ZK=${DOCKER_HOST_IP}:2181 -it jpo-ode_kafka:latest /bin/bash
+docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST_IP=${DOCKER_HOST_IP} -e ZK=${DOCKER_HOST_IP}:2181 -it jpoode_kafka:latest /bin/bash

update_branch.cmd

@@ -1,3 +1,10 @@
+@echo off
+
+IF "%1"=="" (
+ echo usage: update_branch.sh branch_name
+ goto end
+)
+
 copy asn1_codec\asn1c_combined\J2735_201603DA.ASN .
 
 rem Run the following commands to reset existing branch
@@ -15,4 +22,5 @@ git submodule update --recursive --init
 rem Restore the J2735 ASN file
 copy .\J2735_201603DA.ASN asn1_codec\asn1c_combined
 
-
+:end
+pause