Skip to content
Permalink
Browse files

updated docker builds

  • Loading branch information...
p3root committed Feb 26, 2019
1 parent 1c002be commit b8895dda41677c5568d452397e8ff36c29c59df2
Showing with 16 additions and 7 deletions.
  1. +2 −1 docker/automatica/Dockerfile
  2. +5 −4 docker/docker-compose.yml
  3. +2 −1 docker/nginx/Dockerfile
  4. +7 −1 docker/nginx/nginx-automatica-config
@@ -72,7 +72,8 @@ RUN dotnet /tmp/db/Automatica.Core.CI.CreateDatabase.dll /app/automatica
RUN rm -rf /src
RUN rm -rf /tmp/db

EXPOSE 5001
EXPOSE 5001/tcp
EXPOSE 5000/tcp

# Build runtime image
ENTRYPOINT ["dotnet", "/app/automatica.bootloader/Automatica.Core.Bootloader.dll"]
@@ -1,12 +1,13 @@
version: '3'

services:
app:
automatica:
build:
context: ../
dockerfile: docker/automatica/Dockerfile
expose:
- "5001"
ports:
- "5001:5001"
- "5000:5000"

proxy:
build:
@@ -15,7 +16,7 @@ services:
ports:
- "80:80"
links:
- app
- automatica



@@ -1,2 +1,3 @@
FROM nginx
COPY nginx-automatica-config /etc/nginx/nginx.conf
COPY nginx-automatica-config /etc/nginx/nginx.conf
RUN cat /etc/nginx/nginx.conf
@@ -1,3 +1,9 @@
events {
worker_connections 768;
# multi_accept on;
}


http {

##
@@ -29,7 +35,7 @@ http {
server {
listen 80;
location / {
proxy_pass http://localhost:5001;
proxy_pass http://automatica:5001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;

0 comments on commit b8895dd

Please sign in to comment.
You can’t perform that action at this time.