master
VANNEAU 2 years ago
parent bbf0f87003
commit b38b53ddb9
  1. 38
      docker-compose.yml
  2. 119
      docker-compose_old.yml
  3. 24
      nginx/nginx.conf

@ -5,24 +5,22 @@ networks:
services: services:
digitepa_proxy: # digitepa_proxy:
hostname: digitepa_proxy # hostname: digitepa_proxy
container_name: "digitepa_proxy" # container_name: "digitepa_proxy"
image: nginx:1.21.3 # image: nginx:1.21.3
volumes: # volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf # - ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf # - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
- ./nginx/hosts:/etc/hosts # - ./nginx/hosts:/etc/hosts
#- ./nginx/ssl/www.epa.apside.com.crt:/etc/nginx/ssl/www.epa.apside.com.crt # ports:
#- ./nginx/ssl/www.epa.apside.com.key:/etc/nginx/ssl/www.epa.apside.com.key # - "80:80"
ports: # - "443:443"
- "80:80" # links:
- "443:443" # - digitepa_front
links: # - digitepa_back
- digitepa_front # networks:
- digitepa_back # - epa-networks
networks:
- epa-networks
keycloak: keycloak:
hostname: digitepa_keycloak hostname: digitepa_keycloak
@ -35,8 +33,6 @@ services:
- PROXY_ADDRESS_FORWARDING=true - PROXY_ADDRESS_FORWARDING=true
volumes: volumes:
- ./realm-export.json:/tmp/EPA-realm.json - ./realm-export.json:/tmp/EPA-realm.json
#expose:
# - "8080"
ports: ports:
- "8080:8080" - "8080:8080"
networks: networks:
@ -85,8 +81,6 @@ services:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://+:44318 - ASPNETCORE_URLS=http://+:44318
#- ASPNETCORE_Kestrel__Certificates__Default__Password=Epa@digit852
#- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
expose: expose:
- "44318" - "44318"
ports: ports:

@ -0,0 +1,119 @@
version: "3.8"
networks:
epa-networks:
services:
digitepa_proxy:
hostname: digitepa_proxy
container_name: "digitepa_proxy"
image: nginx:1.21.3
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
- ./nginx/hosts:/etc/hosts
#- ./nginx/ssl/www.epa.apside.com.crt:/etc/nginx/ssl/www.epa.apside.com.crt
#- ./nginx/ssl/www.epa.apside.com.key:/etc/nginx/ssl/www.epa.apside.com.key
ports:
- "80:80"
- "443:443"
links:
- digitepa_front
- digitepa_back
networks:
- epa-networks
keycloak:
hostname: digitepa_keycloak
container_name: "digitepa_keycloak"
image: jboss/keycloak:15.0.2
environment:
- KEYCLOAK_USER=${LOGIN_KEYCLOAK:-admin}
- KEYCLOAK_PASSWORD=${PASS_KEYCLOAK:-admin}
- KEYCLOAK_IMPORT=/tmp/EPA-realm.json
- PROXY_ADDRESS_FORWARDING=true
volumes:
- ./realm-export.json:/tmp/EPA-realm.json
#expose:
# - "8080"
ports:
- "8080:8080"
networks:
- epa-networks
digitepa_front:
hostname: digitepa_front
container_name: "digitepa_front"
build:
context: ${PATH_SRC_FRONT}
ports:
- "4200:4200"
networks:
- epa-networks
digitepa_back:
hostname: digitepa_back
container_name: "digitepa_back"
build:
context: ${PATH_SRC_BACK}
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=https://+:44393;http://+:44394
- ASPNETCORE_Kestrel__Certificates__Default__Password=Epa@digit852
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
expose:
- "44393"
- "44394"
ports:
- "44393:44393"
- "44394:44394"
networks:
- epa-networks
links:
- digitepa_db
volumes:
- ${PATH_SRC_BACK}/digitepa_cert.pfx:/https/aspnetapp.pfx
digitepa_collab:
hostname: digitepa_collab
container_name: "digitepa_collab"
build:
context: ${PATH_SRC_COLL}
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://+:44318
#- ASPNETCORE_Kestrel__Certificates__Default__Password=Epa@digit852
#- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
expose:
- "44318"
ports:
- "44318:44318"
networks:
- epa-networks
digitepa_db:
hostname: digitepa_db
container_name: "digitepa_db"
image: mysql:8.0.27
environment:
MYSQL_USER: ${LOGIN_DB:-dev}
MYSQL_PASSWORD: ${PASS_DB:-dev}
MYSQL_ROOT_PASSWORD: ${PASS_DB_ROOT:-passwd}
MYSQL_DATABASE: ${DATABASE:-database_ep}
expose:
- "3306"
ports:
- "3306:3306"
networks:
- epa-networks
volumes:
- ep-db:/var/lib/mysql
- ./sql/init-sql.sql:/docker-entrypoint-initdb.d/init.sql
restart: always
volumes:
ep-db:

@ -8,13 +8,13 @@ http {
server digitepa_front:4200; server digitepa_front:4200;
} }
upstream digitepa_back_up { # upstream digitepa_back_up {
server digitepa_back:44393; # server digitepa_back:44393;
} # }
#upstream digitepa_keycloak_up { # upstream digitepa_keycloak_up {
# server digitepa_keycloak:8080; # server digitepa_keycloak:8080;
#} # }
#server { #server {
# listen 80 default_server; # listen 80 default_server;
@ -41,13 +41,13 @@ http {
proxy_pass http://digitepa_front_up/; proxy_pass http://digitepa_front_up/;
} }
location /api { # location /api {
proxy_pass https://digitepa_back_up/api; # proxy_pass https://digitepa_back_up/api;
} # }
location /auth { # location /auth {
proxy_pass http://digitepa_keycloak:8080/auth; # proxy_pass http://digitepa_keycloak:8080/auth;
} # }
} }

Loading…
Cancel
Save