Merge pull request #2295 from miguelortizdev/develop

Update and implementations in apache2, nginx and swagger
This commit is contained in:
Shao Yu-Lung (Allen) 2021-03-23 22:40:45 +08:00 committed by GitHub
commit e8a28227f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 92 additions and 1 deletions

5
.gitignore vendored
View File

@ -13,6 +13,11 @@
/nginx/ssl/*.key /nginx/ssl/*.key
/nginx/ssl/*.csr /nginx/ssl/*.csr
/apache2/ssl/*.crt
/apache2/ssl/*.key
/apache2/ssl/*.csr
/apache2/ssl/*.org
/.devcontainer/* /.devcontainer/*
!/.devcontainer/devcontainer.example.json !/.devcontainer/devcontainer.example.json
!/.devcontainer/docker-compose.extend-example.yml !/.devcontainer/docker-compose.extend-example.yml

0
apache2/ssl/.gitkeep Normal file
View File

View File

@ -1880,6 +1880,24 @@ services:
volumes: volumes:
- ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data - ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
### SWAGGER EDITOR ############################################
swagger-editor:
build: ./swagger-editor
ports:
- ${SWAGGER_EDITOR_PORT}:8080
networks:
- backend
### SWAGGER UI ################################################
swagger-ui:
build: ./swagger-ui
environment:
- API_URL=${SWAGGER_API_URL}
ports:
- ${SWAGGER_UI_PORT}:8080
networks:
- backend
### tomcat #################################################### ### tomcat ####################################################
tomcat: tomcat:
container_name: tomcat container_name: tomcat
@ -1910,4 +1928,3 @@ services:
volumes: volumes:
- ./react:/usr/src/app/react - ./react:/usr/src/app/react
- /usr/src/app/react/node_modules - /usr/src/app/react/node_modules

View File

@ -339,6 +339,7 @@ APACHE_HOST_HTTP_PORT=80
APACHE_HOST_HTTPS_PORT=443 APACHE_HOST_HTTPS_PORT=443
APACHE_HOST_LOG_PATH=./logs/apache2 APACHE_HOST_LOG_PATH=./logs/apache2
APACHE_SITES_PATH=./apache2/sites APACHE_SITES_PATH=./apache2/sites
APACHE_SSL_PATH=./apache2/ssl
APACHE_PHP_UPSTREAM_CONTAINER=php-fpm APACHE_PHP_UPSTREAM_CONTAINER=php-fpm
APACHE_PHP_UPSTREAM_PORT=9000 APACHE_PHP_UPSTREAM_PORT=9000
APACHE_PHP_UPSTREAM_TIMEOUT=60 APACHE_PHP_UPSTREAM_TIMEOUT=60
@ -881,6 +882,15 @@ PGADMIN_PORT=5050
PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org
PGADMIN_DEFAULT_PASSWORD=admin PGADMIN_DEFAULT_PASSWORD=admin
### SWAGGER EDITOR ###########################################
SWAGGER_EDITOR_PORT=5151
### SWAGGER UI ###############################################
SWAGGER_API_URL=http://generator.swagger.io/api/swagger.json
SWAGGER_UI_PORT=5555
### SONARQUBE ################################################ ### SONARQUBE ################################################
## docker-compose up -d sonarqube ## docker-compose up -d sonarqube
## (If you encounter a database error) ## (If you encounter a database error)

View File

@ -1,3 +1,9 @@
#server {
# listen 80;
# server_name laravel.com.co;
# return 301 https://laravel.com.co$request_uri;
#}
server { server {
listen 80; listen 80;

View File

@ -0,0 +1,47 @@
#server {
# listen 80;
# server_name node.com.co;
# return 301 https://node.com.co$request_uri;
#}
server {
listen 80;
listen [::]:80;
#listen 443;
#listen [::]:443;
server_name node.com.co;
#ssl on;
#ssl_certificate /var/certs/node.com.co/cert.pem;
#ssl_certificate_key /var/certs/node.com.co/privkey.pem;
#ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
#ssl_ciphers HIGH:!aNULL:!MD5;
location / {
proxy_pass http://node.com.co:3001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_cache_bypass $http_upgrade;
}
location ~ /\.ht {
deny all;
}
location /.well-known/acme-challenge/ {
root /var/www/letsencrypt/;
log_not_found off;
}
error_log /var/log/nginx/node.com.co.local_error.log;
access_log /var/log/nginx/node.com.co.local_access.log;
}

View File

@ -0,0 +1,3 @@
FROM swaggerapi/swagger-editor:latest
LABEL maintainer="Miguel Ortiz <miguelortiz1994@outlook.com>"

3
swagger-ui/Dockerfile Normal file
View File

@ -0,0 +1,3 @@
FROM swaggerapi/swagger-ui:latest
LABEL maintainer="Miguel Ortiz <miguelortiz1994@outlook.com>"