Fixing broken OpenResty / Orthanc recipes and updating doc (#2652)

* Updating docker files and documentation for OpenResty / Orthanc recipes.

* fixing link formatting

Co-authored-by: Josiah Vinson <jovinson@microsoft.com>
This commit is contained in:
Josiah VinsonandJosiah Vinson authored and GitHub committed 2022-01-31 10:02:18 -05:00
1 parent 0fc7d93d73
commit c9b7e97f9c
5 files changed
+35 -31

No files matched your search

@@ -10,9 +10,9 @@ services:
ohif_viewer:
build:
# Project root
context: ./../../
context: ./../../../../
# Relative to context
dockerfile: ./docker/OpenResty-Orthanc-Keycloak/dockerfile
dockerfile: ./platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/dockerfile
image: webapp:latest
container_name: webapp
volumes:
@@ -35,7 +35,7 @@ services:
# TODO: Update to use Postgres
# https://github.com/mrts/docker-postgresql-multiple-databases
orthanc:
image: jodogne/orthanc-plugins:1.5.6
image: jodogne/orthanc-plugins:1.9.7
hostname: orthanc
container_name: orthanc
volumes:
@@ -47,7 +47,7 @@ services:
# LINK: https://hub.docker.com/r/jboss/keycloak
keycloak:
image: jboss/keycloak:6.0.1
image: jboss/keycloak:16.1.0
hostname: keycloak
container_name: keycloak
volumes:
@@ -23,7 +23,9 @@
# Stage 1: Build the application
FROM node:11.2.0-slim as builder
# Needs to be pinned at 16.x for now because of https://github.com/webpack/webpack/issues/14532
FROM node:lts-slim as builder
RUN mkdir /usr/src/app
WORKDIR /usr/src/app
@@ -36,12 +38,12 @@ COPY yarn.lock /usr/src/app/yarn.lock
ADD . /usr/src/app/
RUN yarn install
RUN yarn run build:web
RUN yarn run build
# Stage 2: Bundle the built application into a Docker container
# which runs openresty (nginx) using Alpine Linux
# LINK: https://hub.docker.com/r/openresty/openresty
FROM openresty/openresty:1.15.8.1rc1-0-alpine-fat
FROM openresty/openresty:1.19.9.1-4-alpine-fat
RUN mkdir /var/log/nginx
RUN apk add --no-cache openssl
@@ -60,6 +62,6 @@ 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
COPY --from=builder /usr/src/app/platform/viewer/dist /var/www/html
ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]
@@ -10,9 +10,9 @@ services:
ohif_viewer:
build:
# Project root
context: ./../../
context: ./../../../../
# Relative to context
dockerfile: ./docker/OpenResty-Orthanc/dockerfile
dockerfile: ./platform/viewer/.recipes/OpenResty-Orthanc/dockerfile
image: webapp:latest
container_name: webapp
volumes:
@@ -34,7 +34,7 @@ services:
# TODO: Update to use Postgres
# https://github.com/mrts/docker-postgresql-multiple-databases
orthanc:
image: jodogne/orthanc-plugins:1.5.6
image: jodogne/orthanc-plugins:1.9.7
hostname: orthanc
container_name: orthanc
volumes:
@@ -23,7 +23,9 @@
# Stage 1: Build the application
FROM node:11.2.0-slim as builder
# Needs to be pinned at 16.x for now because of https://github.com/webpack/webpack/issues/14532
FROM node:lts-slim as builder
RUN mkdir /usr/src/app
WORKDIR /usr/src/app
@@ -36,12 +38,12 @@ COPY yarn.lock /usr/src/app/yarn.lock
ADD . /usr/src/app/
RUN yarn install
RUN yarn run build:web
RUN yarn run build
# Stage 2: Bundle the built application into a Docker container
# which runs openresty (nginx) using Alpine Linux
# LINK: https://hub.docker.com/r/openresty/openresty
FROM openresty/openresty:1.15.8.1rc1-0-alpine-fat
FROM openresty/openresty:1.19.9.1-4-alpine-fat
RUN mkdir /var/log/nginx
RUN apk add --no-cache openssl
@@ -60,6 +62,6 @@ 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
COPY --from=builder /usr/src/app/platform/viewer/dist /var/www/html
ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]