Shift and rename files to match defaults

This commit is contained in:
dannyrb committed 2019-05-06 13:47:33 -04:00
1 parent 8114f4fe48
commit 411baa702a
6 files changed
+44 -11

No files matched your search

File renamed without changes.
@@ -5,19 +5,25 @@ version: '3.5'
services:
# Exposed server that's handling incoming web requests
# Underlying image: openresty/openresty:alpine-fat
authproxy:
image: authproxy:latest
container_name: authproxy
ohif_viewer:
#
#
build:
# Project root
context: ./../../
dockerfile: ./docker/OpenResty-Orthanc-Keycloak/dockerfile
# image: authproxy:latest
#
#
image: webapp:latest
container_name: webapp
restart: on-failure
volumes:
# Nginx config
# - ./config/nginx.conf:/etc/nginx.conf:ro
- ./config/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf:ro
# Nginx static html
# - ./html/:/usr/share/nginx/html
# Access Log
- ./access.log:/var/log/nginx/test.com.access.log
# # Let's Encrypt
# Let's Encrypt
# - letsencrypt_certificates:/etc/letsencrypt
# - letsencrypt_challenges:/var/www/letsencrypt
ports:
@@ -29,6 +35,27 @@ services:
- orthanc
- keycloak
# authproxy:
# image: authproxy:latest
# container_name: authproxy
# restart: on-failure
# volumes:
# # Nginx config
# - ./config/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf:ro
# # Access Log
# - ./access.log:/var/log/nginx/test.com.access.log
# # Let's Encrypt
# # - letsencrypt_certificates:/etc/letsencrypt
# # - letsencrypt_challenges:/var/www/letsencrypt
# ports:
# # HOST_PORT:CONTAINER_PORT
# # EXTERNAL:INTERNAL
# - '443:443' # SSL
# - '80:80' # Web
# depends_on:
# - orthanc
# - keycloak
# Our image archive (PACS)
# A client protected by keycloak
# authenticated reverse proxy via `authproxy`
@@ -47,7 +74,7 @@ services:
image: postgres:11.2
volumes:
# Should maybe be /var/lib/postgresql/data
- ./keycloak_postgres_data:/var/lib/postgresql
- ./volumes/keycloak_postgres_data:/var/lib/postgresql
environment:
POSTGRES_DB: keycloak
POSTGRES_USER: keycloak
@@ -0,0 +1,49 @@
# Build docker container using
# `docker build -t authproxy .`
#
# This will create a container named `authproxy`
# that can be run with an Nginx configuration
#
# OpenResty is functionally identical to Nginx with the addition of Lua out of
# the box.
# Stage 1: Build the application
# docker build -t ohif/viewer:latest .
FROM node:11.2.0-slim as builder
RUN mkdir /usr/src/app
WORKDIR /usr/src/app
ENV REACT_APP_CONFIG=config/example_openidc.js
ENV PATH /usr/src/app/node_modules/.bin:$PATH
COPY package.json /usr/src/app/package.json
COPY yarn.lock /usr/src/app/yarn.lock
ADD . /usr/src/app/
RUN yarn install
RUN yarn run build:web
# Stage 2: Bundle the built application into a Docker container
# which runs openresty (nginx) using Alpine Linux
FROM openresty/openresty:alpine-fat
RUN mkdir /var/log/nginx
RUN apk add --no-cache openssl
RUN apk add --no-cache openssl-dev
RUN apk add --no-cache git
RUN apk add --no-cache gcc
# RUN luarocks install lua-resty-openidc
RUN luarocks install lua-resty-jwt
RUN luarocks install lua-resty-session
RUN luarocks install lua-resty-jwt
RUN luarocks install lua-resty-http
RUN luarocks install lua-resty-openidc
RUN luarocks install luacrypto
# Copy build output to image
COPY --from=builder /usr/src/app/build /var/www/html
ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]