From 1082d0fcd138b616e7ac898e5c8aed0a08efcdb6 Mon Sep 17 00:00:00 2001 From: Daan Asscheman Date: Mon, 16 Sep 2024 16:45:19 +0200 Subject: [PATCH] testing 14 --- openshift/config/07_sample-app.yaml | 1 + openshift/config/08_sample-svc.yaml | 4 ++++ openshift/nginx.dockerfile | 1 + openshift/openshift.dockerfile | 2 ++ 4 files changed, 8 insertions(+) diff --git a/openshift/config/07_sample-app.yaml b/openshift/config/07_sample-app.yaml index 316aa0a..40306f9 100644 --- a/openshift/config/07_sample-app.yaml +++ b/openshift/config/07_sample-app.yaml @@ -18,6 +18,7 @@ spec: containers: - name: sample-app image: ghcr.io/utrechtuniversity/fsw-openshift:develop + imagePullPolicy: Always ports: - containerPort: 9000 env: diff --git a/openshift/config/08_sample-svc.yaml b/openshift/config/08_sample-svc.yaml index b1a686f..abfcc13 100644 --- a/openshift/config/08_sample-svc.yaml +++ b/openshift/config/08_sample-svc.yaml @@ -9,5 +9,9 @@ spec: ports: - port: 9000 targetPort: 9000 + - port: 7050 + targetPort: 7050 + - port: 5173 + targetPort: 5173 selector: app: sample-app diff --git a/openshift/nginx.dockerfile b/openshift/nginx.dockerfile index a09035e..769209c 100644 --- a/openshift/nginx.dockerfile +++ b/openshift/nginx.dockerfile @@ -5,4 +5,5 @@ ADD ./openshift/vhost.conf /etc/nginx/conf.d/default.conf # Expose port 8443 and start php-fpm server EXPOSE 8080 EXPOSE 7050 +EXPOSE 5173 #CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/openshift/openshift.dockerfile b/openshift/openshift.dockerfile index e4ddb90..eca1e29 100644 --- a/openshift/openshift.dockerfile +++ b/openshift/openshift.dockerfile @@ -56,5 +56,7 @@ RUN chgrp -R 0 /var/www && \ RUN npm install EXPOSE 7050 +EXPOSE 5173 + CMD ["php-fpm"]