Proxy image

.github/workflows/docker-publish-proxy.yml

@@ -0,0 +1,57 @@
+name: Build and publish Docker proxy image
+
+on:
+  workflow_dispatch
+
+env:
+  REGISTRY: ghcr.io
+  SELECTZYME_VERSION: 0.0.5
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v5
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log into registry ${{ env.REGISTRY }}
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Extract Docker metadata
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        tags:
+          type=raw,value=${{ env.SELECTZYME_VERSION }}
+        labels: |
+          org.opencontainers.image.url=${{ github.server_url }}/${{ github.repository }}
+          org.opencontainers.image.title=selectzyme-proxy
+          org.opencontainers.image.description=SelectZyme Web Application proxy
+          org.opencontainers.image.licenses=MIT
+          org.opencontainers.image.version=${{ env.SELECTZYME_VERSION }}
+
+    - name: Build and push Docker proxy image
+      uses: docker/build-push-action@v6
+      with:
+        context: ./nginx
+        # target: final  # if there is a staged building process
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        no-cache: true

.github/workflows/docker-publish.yml → .github/workflows/docker-publish-selectzyme-app.yml

@@ -1,11 +1,11 @@
-name: Build and publish Docker image
+name: Build and publish Docker selectzyme image
 
 on:
   workflow_dispatch
 
 env:
   REGISTRY: ghcr.io
-  SELECTZYME_VERSION: 0.0.4
+  SELECTZYME_VERSION: 0.0.5
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
@@ -46,7 +46,7 @@ jobs:
           org.opencontainers.image.licenses=MIT
           org.opencontainers.image.version=${{ env.SELECTZYME_VERSION }}
 
-    - name: Build and push Docker image
+    - name: Build and push Docker selectzyme image
       uses: docker/build-push-action@v6
       with:
         context: .

README.md

@@ -65,13 +65,13 @@ Because of a restricted company network, images (github: packages) are build usi
 ```mermaid
 sequenceDiagram
     actor User
-    participant BP as Biocloud Proxy
-    participant SDP as Selectzyme Demo Proxy (nginx)
-    participant SDA as Selectzyme Demo App
+    participant BP as Infrastructure Proxy
+    participant SDP as Proxy (nginx)
+    participant SDA as Selectzyme App
 
     User->>+BP: Request resource
     BP->>+SDP: Forward request (e.g., to selectzyme-proxy.selectzyme-network)
-    SDP->>+SDA: Proxy request to Selectzyme Demo App
+    SDP->>+SDA: Proxy request to Selectzyme App
     SDA-->>-SDP: App response
     SDP-->>-BP: Forward response
     BP-->>-User: Response

docker-compose.yml

@@ -1,14 +1,9 @@
 services:
   selectzyme-proxy:
-    image: nginx:alpine
+    image: ghcr.io/ipb-halle/selectzyme-proxy:0.0.5  # from docker.publish-proxy.yml org.opencontainers.image.title=selectzyme-proxy
     # Port forwarding disabled for production runs (profiles or docker-compose.override.yml can be used alternatively)
-    #ports:
-    #  - "80:80"
-    volumes:
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-      - ./nginx/index.html:/usr/share/nginx/html/selectzyme/index.html
-      - ./nginx/bootstrap.min.css:/usr/share/nginx/html/selectzyme/bootstrap.min.css      
-      - ./assets/:/usr/share/nginx/html/selectzyme/assets/      
+    # ports:
+    #   - "80:80"
     depends_on:
       - selectzyme-demo
       - selectzyme-petase
@@ -20,47 +15,47 @@ services:
       - selectzyme-network
 
   selectzyme-demo:
-    image: ghcr.io/ipb-halle/selectzyme-app:0.0.4
+    image: ghcr.io/ipb-halle/selectzyme-app:0.0.5
     environment:
       - DASH_URL_BASE_PATHNAME=/selectzyme/demo/
       - SELECTZYME_DATASET=demo
     networks:
       - selectzyme-network
 
   selectzyme-petase:
-    image: ghcr.io/ipb-halle/selectzyme-app:0.0.4
+    image: ghcr.io/ipb-halle/selectzyme-app:0.0.5
     environment:
       - DASH_URL_BASE_PATHNAME=/selectzyme/petase/
       - SELECTZYME_DATASET=petase
     networks:
       - selectzyme-network
 
   selectzyme-ired:
-    image: ghcr.io/ipb-halle/selectzyme-app:0.0.4
+    image: ghcr.io/ipb-halle/selectzyme-app:0.0.5
     environment:
       - DASH_URL_BASE_PATHNAME=/selectzyme/ired/
       - SELECTZYME_DATASET=ired
     networks:
       - selectzyme-network
 
   selectzyme-lpor:
-    image: ghcr.io/ipb-halle/selectzyme-app:0.0.4
+    image: ghcr.io/ipb-halle/selectzyme-app:0.0.5
     environment:
       - DASH_URL_BASE_PATHNAME=/selectzyme/lpor/
       - SELECTZYME_DATASET=lpor
     networks:
       - selectzyme-network      
 
   selectzyme-lov:
-    image: ghcr.io/ipb-halle/selectzyme-app:0.0.4
+    image: ghcr.io/ipb-halle/selectzyme-app:0.0.5
     environment:
       - DASH_URL_BASE_PATHNAME=/selectzyme/lov/
       - SELECTZYME_DATASET=lov
     networks:
       - selectzyme-network
 
   selectzyme-fmos:
-    image: ghcr.io/ipb-halle/selectzyme-app:0.0.4
+    image: ghcr.io/ipb-halle/selectzyme-app:0.0.5
     environment:
       - DASH_URL_BASE_PATHNAME=/selectzyme/fmos/
       - SELECTZYME_DATASET=fmos

nginx/Dockerfile

@@ -0,0 +1,8 @@
+FROM nginx:alpine
+
+COPY default.conf /etc/nginx/conf.d/default.conf
+COPY index.html /usr/share/nginx/html/selectzyme/index.html
+COPY bootstrap.min.css /usr/share/nginx/html/selectzyme/bootstrap.min.css
+COPY ipb-logo.png /usr/share/nginx/html/selectzyme/ipb-logo.png
+
+# CMD and ENTRYPOINT are inherited from the base image, so we don't need to specify them here unless we want to override them.

nginx/index.html

@@ -7,7 +7,7 @@
 </head>
 <body class="bg-light">
   <div class="container py-5">
-    <img src="assets/ipb-logo.png" alt="IPB Logo" style="position: absolute; top: 20px; right: 20px; height: 50px;" />
+    <img src="ipb-logo.png" alt="IPB Logo" style="position: absolute; top: 20px; right: 20px; height: 50px;" />
 
     <h1 class="mb-4">SelectZyme Analysis Dashboard</h1>
     <p>Select a dataset below to explore the analysis results:</p>