changed deployment

docker-compose.yml

 version: "3"
 services:
-  cbpmanager-nginx:
-    build: ./nginx-forwarder
-    image: cbpmanager-nginx
-    container_name: cbpmanager_nginx_container
-    networks:
-     - cbpmanager_net
   cbpmanager:
     build: ./cbpmanager
-    image: cbpmanager
+    image: harbor.miracum.org/cbpmanager/cbpmanager:latest
     container_name: cbpmanager_container
     networks:
      - cbpmanager_net
@@ -19,7 +13,7 @@ services:
   cbpmanager-shinyproxy:
     restart: unless-stopped
     build: ./shinyproxy
-    image: cbpmanager-shinyproxy
+    image: harbor.miracum.org/cbpmanager/cbpmanager-shinyproxy:latest
     container_name: cbpmanager_shinyproxy_container
     ports:
       - "${PORT:-8080}:8080"
@@ -29,7 +23,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "./shinyproxy-logs/server:/log"
       - "./shinyproxy-logs/container:/container-logs"
-      #- "./shinyproxy:/opt/shinyproxy"
+      - "./services/shinyproxy/application.yml:/app/application.yml"
     networks:
      - cbpmanager_net
 

nginx-forwarder/dockerfile

-FROM nginx:stable-alpine
-
-COPY nginx.conf /etc/nginx/conf.d/nginx.conf
-
-# dockerfile uses `\` to escape, docker-compose uses $$ instead
-
-CMD /bin/sh -c "envsubst '\${APP_NAME}' < /etc/nginx/conf.d/nginx.conf > /etc/nginx/nginx.conf && exec nginx -g 'daemon off;'"

nginx-forwarder/nginx.conf

-events {
-  worker_connections  4096;  ## Default: 1024
-}
-
-http {
-        default_type application/octet-stream;
-        sendfile     on;
-        tcp_nopush   on;
-        server_names_hash_bucket_size 128; # this seems to be required for some vhosts
-
-        server {
-                listen 3838 default_server;
-                listen [::]:3838 default_server ipv6only=on;
-
-                root /usr/share/nginx/html;
-                # index index.html index.htm;
-
-                server_name 127.0.0.1;
-
-                location / {
-                        proxy_pass http://${APP_NAME}:3838/;
-                        proxy_http_version 1.1;
-                        proxy_set_header Upgrade $http_upgrade;
-                        proxy_set_header Connection "upgrade";
-                        proxy_read_timeout 600s;
-                        proxy_redirect    off;
-
-                        proxy_set_header  Host             $http_host;
-                        proxy_set_header  X-Real-IP        $remote_addr;
-                        proxy_set_header  X-Forwarded-For  $proxy_add_x_forwarded_for;
-                        proxy_set_header  X-Forwarded-Proto $scheme;
-                }
-
-
-                location ~ /\.ht {
-                        deny all;
-                }
-        }
-}
\ No newline at end of file

shinyproxy/Dockerfile

-FROM openjdk:8-jre
+FROM alpine as build
 
 RUN mkdir -p /opt/shinyproxy/
 RUN wget https://www.shinyproxy.io/downloads/shinyproxy-2.5.0.jar -O /opt/shinyproxy/shinyproxy.jar
-COPY application.yml /opt/shinyproxy/application.yml
 
-WORKDIR /opt/shinyproxy
-CMD ["java", "-jar", "/opt/shinyproxy/shinyproxy.jar"]
+FROM gcr.io/distroless/java-debian10:11
+
+COPY --from=build /opt/shinyproxy/shinyproxy.jar /app/shinyproxy.jar
+COPY application.yml /app/application.yml
+WORKDIR /app
+CMD ["/app/shinyproxy.jar"]

shinyproxy/application.yml

@@ -14,7 +14,7 @@ proxy:
   specs:
   - id: cbpmanager
     display-name: Data manager for cBioPortal studies
-    container-image: cbpmanager-nginx
+    container-image: harbor.miracum.org/cbpmanager/cbpmanager
     container-network: "${proxy.docker.container-network}"
     container-env:
       APP_NAME: cbpmanager
@@ -25,7 +25,3 @@ logging:
 server:
   servlet:
     context-path: /
-    #context-path:  /cbpmanager
-    #useForwardHeaders: true
-    #servlet:
-    #  context-path: /cbpmanager