Improve self deployment
parent
8ae58c9ef3
commit
d67e68d0d9
@ -0,0 +1 @@
|
|||||||
|
PROFILE=staging
|
||||||
@ -1,11 +1,23 @@
|
|||||||
FROM openjdk:8-jdk-alpine
|
FROM maven:3-jdk-8-alpine AS MAVEN_BUILD
|
||||||
RUN apk add --update \
|
|
||||||
curl \
|
|
||||||
&& rm -rf /var/cache/apk/*
|
|
||||||
VOLUME /tmp
|
COPY pom.xml /build/
|
||||||
ARG PROFILE=production
|
COPY data /build/data/
|
||||||
ENV PROF $PROFILE
|
COPY elastic /build/elastic/
|
||||||
ADD web/src/main/resources/ProjectConfiguration.xml /tmp/ProjectConfiguration.xml
|
COPY logging /build/logging/
|
||||||
ADD web/src/main/resources/ExternalUrls.xml /tmp/ExternalUrls.xml
|
COPY queryable /build/queryable/
|
||||||
ADD web/target/web-1.0-SNAPSHOT.jar app.jar
|
COPY web /build/web/
|
||||||
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROF}","-jar","/app.jar"]
|
|
||||||
|
|
||||||
|
|
||||||
|
WORKDIR /build/
|
||||||
|
RUN mvn package
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
FROM openjdk:8-jre-alpine
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY --from=MAVEN_BUILD /build/web/target/web-1.0-SNAPSHOT.jar /app/app.jar
|
||||||
|
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROFILE}","-jar","/app/app.jar"]
|
||||||
@ -1,17 +1,32 @@
|
|||||||
FROM johnpapa/angular-cli as angular
|
# stage1 as builder
|
||||||
WORKDIR /app
|
FROM node:12-alpine as builder
|
||||||
COPY package.json /app/
|
|
||||||
RUN npm cache clear --force && npm install
|
WORKDIR /page
|
||||||
|
|
||||||
COPY ./ /app/
|
# copy the package.json to install dependencies
|
||||||
ARG env=dev
|
COPY package.json /page
|
||||||
ARG aot=--no-aot
|
|
||||||
RUN echo $env
|
# Install the dependencies and make the folder
|
||||||
RUN echo $aot
|
RUN npm install
|
||||||
RUN if [ "$env" = "prod" ]; then ng build --$env --$aot; else ng build --$aot; fi
|
|
||||||
|
COPY . /page
|
||||||
# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
|
|
||||||
FROM nginx:1.13
|
# Build the project and copy the files
|
||||||
COPY --from=angular /app/dist/ /usr/share/nginx/html
|
RUN npm run ng build -- --deploy-url=/ --prod
|
||||||
COPY --from=angular /app/static/ /usr/share/nginx/static
|
|
||||||
COPY ./nginx-custom.conf /etc/nginx/conf.d/default.conf
|
FROM nginx:alpine
|
||||||
|
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
COPY nginx.conf /etc/nginx
|
||||||
|
COPY mime.types /etc/nginx
|
||||||
|
|
||||||
|
## Remove default nginx index page
|
||||||
|
RUN rm -rf /usr/share/nginx/html/*
|
||||||
|
|
||||||
|
# Copy from the stahg 1
|
||||||
|
COPY --from=builder /page/dist /usr/share/nginx/html
|
||||||
|
|
||||||
|
EXPOSE 4200
|
||||||
|
|
||||||
|
ENTRYPOINT ["nginx", "-g", "daemon off;", "-p", "/usr/share/nginx"]
|
||||||
|
|||||||
@ -0,0 +1,48 @@
|
|||||||
|
types {
|
||||||
|
text/html html htm shtml;
|
||||||
|
text/css css;
|
||||||
|
text/xml xml rss;
|
||||||
|
image/gif gif;
|
||||||
|
image/jpeg jpeg jpg;
|
||||||
|
application/x-javascript js;
|
||||||
|
text/plain txt;
|
||||||
|
text/x-component htc;
|
||||||
|
text/mathml mml;
|
||||||
|
image/png png;
|
||||||
|
image/x-icon ico;
|
||||||
|
image/x-jng jng;
|
||||||
|
image/vnd.wap.wbmp wbmp;
|
||||||
|
application/java-archive jar war ear;
|
||||||
|
application/mac-binhex40 hqx;
|
||||||
|
application/pdf pdf;
|
||||||
|
application/x-cocoa cco;
|
||||||
|
application/x-java-archive-diff jardiff;
|
||||||
|
application/x-java-jnlp-file jnlp;
|
||||||
|
application/x-makeself run;
|
||||||
|
application/x-perl pl pm;
|
||||||
|
application/x-pilot prc pdb;
|
||||||
|
application/x-rar-compressed rar;
|
||||||
|
application/x-redhat-package-manager rpm;
|
||||||
|
application/x-sea sea;
|
||||||
|
application/x-shockwave-flash swf;
|
||||||
|
application/x-stuffit sit;
|
||||||
|
application/x-tcl tcl tk;
|
||||||
|
application/x-x509-ca-cert der pem crt;
|
||||||
|
application/x-xpinstall xpi;
|
||||||
|
application/zip zip;
|
||||||
|
application/octet-stream deb;
|
||||||
|
application/octet-stream bin exe dll;
|
||||||
|
application/octet-stream dmg;
|
||||||
|
application/octet-stream eot;
|
||||||
|
application/octet-stream iso img;
|
||||||
|
application/octet-stream msi msp msm;
|
||||||
|
audio/mpeg mp3;
|
||||||
|
audio/x-realaudio ra;
|
||||||
|
video/mpeg mpeg mpg;
|
||||||
|
video/quicktime mov;
|
||||||
|
video/x-flv flv;
|
||||||
|
video/x-msvideo avi;
|
||||||
|
video/x-ms-wmv wmv;
|
||||||
|
video/x-ms-asf asx asf;
|
||||||
|
video/x-mng mng;
|
||||||
|
}
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 4096; ## Default: 1024
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
include ./mime.types;
|
||||||
|
server {
|
||||||
|
|
||||||
|
listen 4200;
|
||||||
|
|
||||||
|
sendfile on;
|
||||||
|
|
||||||
|
gzip on;
|
||||||
|
gzip_http_version 1.1;
|
||||||
|
gzip_disable "MSIE [1-6]\.";
|
||||||
|
gzip_min_length 1100;
|
||||||
|
gzip_vary on;
|
||||||
|
gzip_proxied expired no-cache no-store private auth;
|
||||||
|
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||||
|
gzip_comp_level 9;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
location / {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
try_files $uri $uri/ /index.html =404;
|
||||||
|
add_header Cache-Control "no-store, no-cache, must-revalidate";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,212 +1,41 @@
|
|||||||
---
|
version: '2.2'
|
||||||
version: '3'
|
|
||||||
services:
|
|
||||||
# The environment variable "TAG" is used throughout this file to
|
|
||||||
# specify the version of the images to run. The default is set in the
|
|
||||||
# '.env' file in this folder. It can be overridden with any normal
|
|
||||||
# technique for setting environment variables, for example:
|
|
||||||
#
|
|
||||||
# TAG=6.0.0-beta1 docker-compose up
|
|
||||||
#
|
|
||||||
# REF: https://docs.docker.com/compose/compose-file/#variable-substitution
|
|
||||||
#
|
|
||||||
# Also be sure to set the ELASTIC_VERSION variable. For released versions,
|
|
||||||
# ${TAG} and ${ELASTIC_VERSION} will be identical, but for pre-release
|
|
||||||
# versions, ${TAG} might contain an extra build identifier, like
|
|
||||||
# "6.0.0-beta1-3eab5b40", so a full invocation might look like:
|
|
||||||
#
|
|
||||||
# ELASTIC_VERSION=6.0.0-beta1 TAG=6.0.0-beta1-3eab5b40 docker-compose up
|
|
||||||
#
|
|
||||||
|
|
||||||
##########################DMP######################################################################
|
|
||||||
|
|
||||||
|
services:
|
||||||
dmp-backend:
|
dmp-backend:
|
||||||
build:
|
build:
|
||||||
context: ./dmp-backend
|
context: ./dmp-backend
|
||||||
args:
|
container_name: opendmp-backend
|
||||||
PROFILE: ${PROFILE}
|
env_file: ./dmp-backend/Docker/dmp-backend.env
|
||||||
container_name: dmp-backend
|
restart: unless-stopped
|
||||||
ports: ['0.0.0.0:8080:8080']
|
mem_limit: 2048m
|
||||||
links:
|
ports:
|
||||||
# - logstash:logstash
|
- "8081:8081"
|
||||||
- elasticsearch-dmp:elasticsearch-dmp
|
networks:
|
||||||
networks: ['stack','elasticsearch-dmp']
|
- opendmp-backend-network
|
||||||
|
volumes:
|
||||||
|
- ./openDMP/dmp-backend/config:/app/config
|
||||||
|
- ./openDMP/dmp-backend/user-guide:/app/user-guide
|
||||||
|
- ./openDMP/dmp-backend/i18n:/app/i18n
|
||||||
|
- ./openDMP/dmp-backend/externalUrls:/app/externalUrls
|
||||||
|
- ./openDMP/dmp-backend/templates:/app/templates
|
||||||
|
- ./openDMP/dmp-backend/opendmp-logs:/app/logs
|
||||||
|
- ./openDMP/dmp-backend/tmp:/app/tmp
|
||||||
|
- ./openDMP/dmp-backend/logging:/app/logging
|
||||||
|
|
||||||
dmp-frontend:
|
dmp-frontend:
|
||||||
build:
|
build:
|
||||||
context: ./dmp-frontend
|
context: ./dmp-frontend
|
||||||
args:
|
container_name: opendmp-frontend
|
||||||
env: ${ENV}
|
mem_limit: 2048m
|
||||||
aot: ${AOT}
|
restart: unless-stopped
|
||||||
container_name: dmp-frontend
|
ports:
|
||||||
volumes:
|
- "8080:4200"
|
||||||
- ./static:/usr/share/nginx/static
|
|
||||||
- /srv/docker/wwwcert:/usr/share/nginx/wwwcert
|
|
||||||
ports: ['0.0.0.0:80:80']
|
|
||||||
networks: ['stack']
|
|
||||||
|
|
||||||
##########################ELASTIC######################################################################
|
|
||||||
elasticsearch-dmp:
|
|
||||||
image: docker.elastic.co/elasticsearch/elasticsearch:${TAG}
|
|
||||||
container_name: elasticsearch-dmp
|
|
||||||
volumes:
|
|
||||||
- ./elastic-config/elasticsearch-custom.yml:/usr/share/elasticsearch/config/elasticsearch.yml
|
|
||||||
environment: ['http.host=0.0.0.0','transport.host=0.0.0.0','discovery.type=single-node']
|
|
||||||
ports: ['0.0.0.0:9201:9200','0.0.0.0:9301:9300']
|
|
||||||
networks: ['elasticsearch-dmp']
|
|
||||||
volumes:
|
|
||||||
- esdata-dmp:/usr/share/elasticsearch/data
|
|
||||||
|
|
||||||
##########################ELK-STACK######################################################################
|
|
||||||
|
|
||||||
elasticsearch:
|
|
||||||
image: docker.elastic.co/elasticsearch/elasticsearch:${TAG}
|
|
||||||
container_name: elasticsearch
|
|
||||||
environment: ['http.host=0.0.0.0', 'transport.host=127.0.0.1', 'ELASTIC_PASSWORD=${ELASTIC_PASSWORD}','discovery.type=single-node']
|
|
||||||
ports: ['0.0.0.0:9200:9200']
|
|
||||||
networks: ['stack']
|
|
||||||
volumes:
|
|
||||||
- esdata:/usr/share/elasticsearch/data
|
|
||||||
|
|
||||||
kibana:
|
|
||||||
image: docker.elastic.co/kibana/kibana:${TAG}
|
|
||||||
container_name: kibana
|
|
||||||
ports: ['0.0.0.0:5601:5601']
|
|
||||||
networks: ['stack']
|
|
||||||
depends_on: ['elasticsearch']
|
|
||||||
|
|
||||||
logstash:
|
|
||||||
image: docker.elastic.co/logstash/logstash:${TAG}
|
|
||||||
container_name: logstash
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./ELK.Docker/config/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
|
- ./openDMP/dmp-frontend/static-files:/usr/share/nginx/static
|
||||||
ports: ['0.0.0.0:31311:31311']
|
- ./openDMP/dmp-frontend/webapp/config:/usr/share/nginx/html/assets/config
|
||||||
|
networks:
|
||||||
networks: ['stack']
|
- opendmp-frontend-network
|
||||||
depends_on: ['elasticsearch', 'setup_logstash']
|
|
||||||
|
networks:
|
||||||
#filebeat:
|
opendmp-frontend-network:
|
||||||
# image: docker.elastic.co/beats/filebeat:${TAG}
|
opendmp-backend-network:
|
||||||
# container_name: filebeat
|
|
||||||
# command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
|
|
||||||
# networks: ['stack']
|
|
||||||
# depends_on: ['elasticsearch', 'setup_filebeat']
|
|
||||||
|
|
||||||
#heartbeat:
|
|
||||||
# image: docker.elastic.co/beats/heartbeat:${TAG}
|
|
||||||
# container_name: heartbeat
|
|
||||||
# command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
|
|
||||||
# networks: ['stack']
|
|
||||||
# depends_on: ['elasticsearch', 'setup_heartbeat']
|
|
||||||
|
|
||||||
# Run a short-lived container to set up Logstash.
|
|
||||||
setup_logstash:
|
|
||||||
image: centos:7
|
|
||||||
container_name: setup_logstash
|
|
||||||
volumes: ['./ELK.Docker/scripts/setup-logstash.sh:/usr/local/bin/setup-logstash.sh:ro']
|
|
||||||
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-logstash.sh | tr -d "\r" | bash']
|
|
||||||
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
|
|
||||||
networks: ['stack']
|
|
||||||
depends_on: ['elasticsearch']
|
|
||||||
|
|
||||||
setup_kibana:
|
|
||||||
image: centos:7
|
|
||||||
container_name: setup_kibana
|
|
||||||
volumes: ['./ELK.Docker/scripts/setup-kibana.sh:/usr/local/bin/setup-kibana.sh:ro']
|
|
||||||
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-kibana.sh | tr -d "\r" | bash']
|
|
||||||
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
|
|
||||||
networks: ['stack']
|
|
||||||
depends_on: ['elasticsearch']
|
|
||||||
|
|
||||||
#setup_filebeat:
|
|
||||||
# image: docker.elastic.co/beats/filebeat:${TAG}
|
|
||||||
# container_name: setup_filebeat
|
|
||||||
# volumes: ['./ELK.Docker/scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
|
|
||||||
# command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s filebeat']
|
|
||||||
# environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
|
|
||||||
# networks: ['stack']
|
|
||||||
# depends_on: ['kibana']
|
|
||||||
|
|
||||||
#setup_heartbeat:
|
|
||||||
# image: docker.elastic.co/beats/heartbeat:${TAG}
|
|
||||||
# container_name: setup_heartbeat
|
|
||||||
# volumes: ['./ELK.Docker/scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
|
|
||||||
# command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s heartbeat']
|
|
||||||
# environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
|
|
||||||
# networks: ['stack']
|
|
||||||
# depends_on: ['kibana']
|
|
||||||
|
|
||||||
##########################DOCSBOX######################################################################
|
|
||||||
# web:
|
|
||||||
# restart: always
|
|
||||||
# build: ./docsbox-master/docsbox
|
|
||||||
# expose:
|
|
||||||
# - "8000"
|
|
||||||
# links:
|
|
||||||
# - redis:redis
|
|
||||||
# volumes:
|
|
||||||
# - docsbox:/home/docsbox
|
|
||||||
# - media:/home/docsbox/media
|
|
||||||
# command: gunicorn -b :8000 docsbox:app
|
|
||||||
# networks: ['stack']
|
|
||||||
|
|
||||||
# rqworker:
|
|
||||||
# restart: always
|
|
||||||
# build: ./docsbox-master/docsbox
|
|
||||||
# links:
|
|
||||||
# - redis:redis
|
|
||||||
# volumes:
|
|
||||||
# - web
|
|
||||||
# command: rq worker -c docsbox.settings
|
|
||||||
# networks: ['stack']
|
|
||||||
|
|
||||||
# rqscheduler:
|
|
||||||
# restart: always
|
|
||||||
# build: ./docsbox-master/docsbox
|
|
||||||
# links:
|
|
||||||
# - redis:redis
|
|
||||||
# volumes:
|
|
||||||
# - web
|
|
||||||
# command: rqscheduler -H redis -p 6379 -d 0
|
|
||||||
# networks: ['stack']
|
|
||||||
|
|
||||||
# nginx:
|
|
||||||
# restart: always
|
|
||||||
# build: ./docsbox-master/nginx/
|
|
||||||
# ports:
|
|
||||||
# - "81:80"
|
|
||||||
# volumes:
|
|
||||||
# - web
|
|
||||||
# links:
|
|
||||||
# - web:web
|
|
||||||
# networks: ['stack']
|
|
||||||
|
|
||||||
# redis:
|
|
||||||
# restart: always
|
|
||||||
# image: redis:latest
|
|
||||||
# expose:
|
|
||||||
# - "6379"
|
|
||||||
# volumes:
|
|
||||||
# - redisdata:/data
|
|
||||||
# networks: ['stack']
|
|
||||||
|
|
||||||
|
|
||||||
##########################SETTINGS######################################################################
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
esdata:
|
|
||||||
driver: local
|
|
||||||
esdata-dmp:
|
|
||||||
driver: local
|
|
||||||
#redisdata:
|
|
||||||
# driver: local
|
|
||||||
# docsbox:
|
|
||||||
# driver: local
|
|
||||||
# media:
|
|
||||||
# driver: local
|
|
||||||
networks:
|
|
||||||
stack: {}
|
|
||||||
elasticsearch-dmp: {}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue