Testing.

UtrechtUniversity · Jun 21, 2024 · 74313cd · 74313cd
1 parent a3a9f77
commit 74313cd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/openshift/openshift.dockerfile b/openshift/openshift.dockerfile
@@ -39,7 +39,7 @@ RUN chmod -R a+rw /var/www/storage
 RUN php artisan key:generate
 
 # entrypoint
-COPY ./docker/backend-entrypoint.sh /entrypoint.sh
+COPY ./openshift/openshift-entrypoint.sh /entrypoint.sh
 RUN chmod ugo+x /entrypoint.sh
 
 RUN php artisan optimize

diff --git a/openshift/sample/7_nginx.yaml b/openshift/sample/7_nginx.yaml
@@ -2,6 +2,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx
+  labels:
+    app: fsw-nginx
+    app.kubernetes.io/part-of: fsw-sample-app
 spec:
   replicas: 1
   selector:
@@ -14,6 +17,6 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: ghcr.io/utrechtuniversity/openshift-nginx:latest
+          image: ghcr.io/utrechtuniversity/nginx:latest
           ports:
             - containerPort: 8080
diff --git a/openshift/sample/7_sample-ingress.yaml → openshift/sample/8_sample-ingress.yaml b/openshift/sample/7_sample-ingress.yaml → openshift/sample/8_sample-ingress.yaml
@@ -18,6 +18,6 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: sample-app
+                name: nginx
                 port:
                   number: 80
diff --git a/openshift/vhost.conf b/openshift/vhost.conf
@@ -11,7 +11,7 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass backend:9000;
+        fastcgi_pass sample-app:80;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;