Skip to content

Commit

Permalink
Merge branch 'dockerfile-cleanup' into ode-787
Browse files Browse the repository at this point in the history
# Conflicts:
#	docker-compose-ppm-nsv.yml
  • Loading branch information
hmusavi committed Nov 29, 2018
2 parents 37e0ce7 + 78b4cf5 commit 46555c9
Show file tree
Hide file tree
Showing 20 changed files with 99 additions and 637 deletions.
107 changes: 58 additions & 49 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,51 +1,60 @@
FROM ubuntu:18.04
FROM maven:3.5.4-jdk-8-alpine as builder
MAINTAINER [email protected]

#Install necessary software
RUN apt-get update && \
apt-get install -y software-properties-common git
RUN apt-get update && \
apt-get install -y apt-utils
RUN apt-get update && \
apt-get install -y wget supervisor dnsutils curl jq net-tools
RUN apt-get update && \
apt-get install -y openjdk-8-jdk
RUN apt-get update && \
apt-get install -y vim
RUN apt-get update && \
apt-get install -y nano
#RUN apt-get update && \
# apt-cache search maven && \
# apt-get install -y maven

RUN apt-get clean

##install docker
#RUN apt-get install -y apt-transport-https ca-certificates
#RUN apt-key adv \
# --keyserver hkp:https://ha.pool.sks-keyservers.net:80 \
# --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
#RUN echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | tee /etc/apt/sources.list.d/docker.list
#RUN apt-get update && apt-get install -y docker docker-engine
#RUN apt-cache policy docker-engine
##RUN apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
#RUN service docker start

#Add ODE binary files
ADD jpo-ode-svcs/target/jpo-ode-svcs-0.0.1-SNAPSHOT.jar /home

ADD docker/start-ode.sh /usr/bin/start-ode.sh
ADD jpo-ode-svcs/src/main/resources/application.properties /home
ADD jpo-ode-svcs/src/main/resources/logback.xml /home

# Build ODE inside the image
#RUN cd /home/jpo-ode/jpo-ode-private && mvn clean && mvn install
#RUN cd /home/jpo-ode && mvn clean && mvn install
#RUN cp /home/jpo-ode/jpo-ode-svcs/target/jpo-ode-svcs-0.0.1-SNAPSHOT.jar /home

#Change permissions and run scripts
RUN chmod a+x /usr/bin/start-ode.sh

# Use "exec" form so that it runs as PID 1 (useful for graceful shutdown)
#CMD bash -c 'start-kafka.sh & ; start-ode.sh'
CMD bash -c 'start-ode.sh'
# 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/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 ./ ./

RUN mvn clean install -DskipTests

FROM openjdk:8u171-jre-alpine

WORKDIR /home

COPY --from=builder /home/jpo-ode-svcs/src/main/resources/application.properties /home
COPY --from=builder /home/jpo-ode-svcs/src/main/resources/logback.xml /home
COPY --from=builder /home/jpo-ode-svcs/target/jpo-ode-svcs-0.0.1-SNAPSHOT.jar /home

ENTRYPOINT ["java", \
"-Djava.rmi.server.hostname=$DOCKER_HOST_IP", \
"-Dcom.sun.management.jmxremote.port=9090", \
"-Dcom.sun.management.jmxremote.rmi.port=9090", \
"-Dcom.sun.management.jmxremote", \
"-Dcom.sun.management.jmxremote.local.only=true", \
"-Dcom.sun.management.jmxremote.authenticate=false", \
"-Dcom.sun.management.jmxremote.ssl=false", \
"-Dlogback.configurationFile=/home/logback.xml", \
"-jar", \
"/home/jpo-ode-svcs-0.0.1-SNAPSHOT.jar"]
33 changes: 33 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
default:
$(info Make target options:)
$(info `make start` to build and run the ODE)
$(info `make stop` to stop the ODE)
$(info `make delete` to destroy the current Docker containers)
$(info `make rebuild` to stop, delete, and then rebuild the containers)

start:
ifeq ("$(wildcard ./jpo-ode-private)", "")
$(error "ERROR: Directory `jpo-ode-private` not found in ${PWD}")
endif
ifeq ("$(wildcard ./asn1_codec/asn1c_combined/J2735_201603DA.ASN)", "")
cp ./jpo-ode-private/j2735/J2735_201603DA.ASN ./asn1_codec/asn1c_combined/J2735_201603DA.ASN
endif
ifndef DOCKER_HOST_IP
$(error ERROR: Environment variable DOCKER_HOST_IP is not set)
endif
ifndef DOCKER_SHARED_VOLUME
$(error ERROR: Environment variable DOCKER_SHARED_VOLUME is not set)
endif
ifeq ("$(wildcard .env)", "")
$(warning "WARNING: Environment file `.env` not found in ${PWD}")
endif
docker-compose up --build -d

stop:
docker-compose down

delete:
docker-compose rm -fvs

rebuild:
$(MAKE) stop delete start
File renamed without changes.
19 changes: 3 additions & 16 deletions docker-compose-ppm-nsv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ services:
- "2181:2181"

kafka:
#build: ./docker/kafka
image: wurstmeister/kafka
ports:
- "9092:9092"
Expand Down Expand Up @@ -40,6 +39,7 @@ services:

ode:
build: .
image: jpoode_ode:latest
ports:
- "8080:8080"
- "9090:9090"
Expand All @@ -60,9 +60,6 @@ services:
# ODE_OUTPUT_SCHEMA_VERSION: ${ODE_OUTPUT_SCHEMA_VERSION}
depends_on:
- kafka
links:
- kafka
- zookeeper
volumes:
- ${DOCKER_SHARED_VOLUME}/ode:/jpo-ode

Expand All @@ -74,8 +71,6 @@ services:
ACM_CONFIG_FILE: adm.properties
depends_on:
- kafka
links:
- kafka
volumes:
- ${DOCKER_SHARED_VOLUME}/adm:/asn1_codec_share

Expand All @@ -87,8 +82,6 @@ services:
ACM_CONFIG_FILE: aem.properties
depends_on:
- kafka
links:
- kafka
volumes:
- ${DOCKER_SHARED_VOLUME}/aem:/asn1_codec_share

Expand Down Expand Up @@ -138,8 +131,6 @@ services:
DEPOSIT_TOPIC: ${CVPEP_BSM_TOPIC}
depends_on:
- kafka
links:
- kafka

rde_bsm_depositor:
build: ./jpo-s3-deposit
Expand All @@ -153,8 +144,6 @@ services:
DEPOSIT_TOPIC: ${RDE_BSM_TOPIC}
depends_on:
- kafka
links:
- kafka

cvpep_tim_depositor:
build: ./jpo-s3-deposit
Expand All @@ -168,8 +157,6 @@ services:
DEPOSIT_TOPIC: ${CVPEP_TIM_TOPIC}
depends_on:
- kafka
links:
- kafka

rde_tim_depositor:
build: ./jpo-s3-deposit
Expand All @@ -183,10 +170,10 @@ services:
DEPOSIT_TOPIC: ${RDE_TIM_TOPIC}
depends_on:
- kafka
links:
- kafka

sec:
build: ./jpo-security-svcs
image: jpoode_sec:latest
ports:
- "8090:8090"
environment:
Expand Down
23 changes: 5 additions & 18 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ services:
- "2181:2181"

kafka:
#build: ./docker/kafka
image: wurstmeister/kafka
ports:
- "9092:9092"
Expand Down Expand Up @@ -36,6 +35,7 @@ services:

ode:
build: .
image: jpoode_ode:latest
ports:
- "8080:8080"
- "9090:9090"
Expand All @@ -56,9 +56,6 @@ services:
# ODE_OUTPUT_SCHEMA_VERSION: ${ODE_OUTPUT_SCHEMA_VERSION}
depends_on:
- kafka
links:
- kafka
- zookeeper
volumes:
- ${DOCKER_SHARED_VOLUME}:/jpo-ode

Expand All @@ -70,8 +67,6 @@ services:
ACM_CONFIG_FILE: adm.properties
depends_on:
- kafka
links:
- kafka
volumes:
- ${DOCKER_SHARED_VOLUME}:/asn1_codec_share

Expand All @@ -83,13 +78,11 @@ services:
ACM_CONFIG_FILE: aem.properties
depends_on:
- kafka
links:
- kafka
volumes:
- ${DOCKER_SHARED_VOLUME}:/asn1_codec_share

ppm_bsm:
build:
build:
context: ./jpo-cvdp
dockerfile: Dockerfile
image: jpoode_ppm:latest
Expand All @@ -102,7 +95,7 @@ services:
- kafka

ppm_tim:
build:
build:
context: ./jpo-cvdp
dockerfile: Dockerfile
image: jpoode_ppm:latest
Expand All @@ -126,8 +119,6 @@ services:
DEPOSIT_TOPIC: ${CVPEP_BSM_TOPIC}
depends_on:
- kafka
links:
- kafka

rde_bsm_depositor:
build: ./jpo-s3-deposit
Expand All @@ -141,8 +132,6 @@ services:
DEPOSIT_TOPIC: ${RDE_BSM_TOPIC}
depends_on:
- kafka
links:
- kafka

cvpep_tim_depositor:
build: ./jpo-s3-deposit
Expand All @@ -156,8 +145,6 @@ services:
DEPOSIT_TOPIC: ${CVPEP_TIM_TOPIC}
depends_on:
- kafka
links:
- kafka

rde_tim_depositor:
build: ./jpo-s3-deposit
Expand All @@ -171,10 +158,10 @@ services:
DEPOSIT_TOPIC: ${RDE_TIM_TOPIC}
depends_on:
- kafka
links:
- kafka

sec:
build: ./jpo-security-svcs
image: jpoode_sec:latest
ports:
- "8090:8090"
environment:
Expand Down
56 changes: 0 additions & 56 deletions docker/README.md

This file was deleted.

Loading

0 comments on commit 46555c9

Please sign in to comment.