Feature/da opschonen

.github/workflows/docker-image-Laravel.yml

@@ -0,0 +1,34 @@
+name: Docker Image Laravel
+env:
+  # 🖊️ EDIT to change the image registry settings.
+  # Registries such as GHCR, Quay.io, and Docker Hub are supported.
+  IMAGE_REGISTRY: ghcr.io/utrechtuniversity
+  IMAGE_REGISTRY_USER: ${{ github.actor }}
+  IMAGE_REGISTRY_PASSWORD: ${{ github.token }}
+on:
+  push:
+    branches: [ "master", "develop", "feature/da_opschonen"]
+  pull_request:
+    branches: [ "master" ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build from Dockerfile
+      id: build-image
+      uses: redhat-actions/buildah-build@v2
+      with:
+        image: fsw-openshift
+        tags: latest
+        dockerfiles: |
+          ./openshift/openshift.dockerfile
+    - name: Push to registry
+      id: push-image
+      uses: redhat-actions/push-to-registry@v2
+      with:
+        image: ${{ steps.build-image.outputs.image }}
+        tags: ${{ steps.build-image.outputs.tags }}
+        registry: ${{ env.IMAGE_REGISTRY }}
+        username: ${{ env.IMAGE_REGISTRY_USER }}
+        password: ${{ env.IMAGE_REGISTRY_PASSWORD }}

.github/workflows/docker-image-Nginx.yml

@@ -0,0 +1,34 @@
+name: Docker Image Nginx
+env:
+  # 🖊️ EDIT to change the image registry settings.
+  # Registries such as GHCR, Quay.io, and Docker Hub are supported.
+  IMAGE_REGISTRY: ghcr.io/utrechtuniversity
+  IMAGE_REGISTRY_USER: ${{ github.actor }}
+  IMAGE_REGISTRY_PASSWORD: ${{ github.token }}
+on:
+  push:
+    branches: [ "master", "develop", "feature/da_opschonen" ]
+  pull_request:
+    branches: [ "master" ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build the Docker image
+      id: build-image
+      uses: redhat-actions/buildah-build@v2
+      with:
+        image: Nginx
+        tags: latest
+        dockerfiles: |
+          ./openshift/nginx.dockerfile
+    - name: Push to registry
+      id: push-image
+      uses: redhat-actions/push-to-registry@v2
+      with:
+        image: ${{ steps.build-image.outputs.image }}
+        tags: ${{ steps.build-image.outputs.tags }}
+        registry: ${{ env.IMAGE_REGISTRY }}
+        username: ${{ env.IMAGE_REGISTRY_USER }}
+        password: ${{ env.IMAGE_REGISTRY_PASSWORD }}

.github/workflows/openshift.yml

@@ -148,7 +148,7 @@ jobs:
         # Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build
         # Otherwise, point this to your Dockerfile/Containerfile relative to the repository root.
         dockerfiles: |
-          ./docker/backend.dockerfile
+          ./openshift/openshift.dockerfile
 
     # https://github.com/redhat-actions/push-to-registry#readme
     - name: Push to registry

README.md

@@ -9,3 +9,13 @@ https://www.redhat.com/sysadmin/codeready-containers
 
 Soms wil hij niet starten, dan moet je de vm verwijderen en opnieuw starten:
 `crc cleanup`
+
+
+### Local development:
+Add the following to your /etc/hosts file:
+
+``` 127.0.0.1        openshift.docker.dev```
+
+run the following command in the root of the project:
+
+```docker compose up -d --build```

config/database.php

@@ -46,11 +46,11 @@
         'mysql' => [
             'driver' => 'mysql',
             'url' => env('DATABASE_URL'),
-            'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
+            'host'      => env('DB_HOST', getenv('LARAVEL_DATABASE_HOST')),
+            'database'  => env('DB_DATABASE', getenv('LARAVEL_DATABASE_NAME')),
+            'username'  => env('DB_USERNAME', getenv('LARAVEL_DATABASE_USER')),
+            'password'  => env('DB_PASSWORD', getenv('LARAVEL_DATABASE_PASSWORD')),
+            'port'      => env('DB_PORT', getenv('LARAVEL_DATABASE_PORT_NUMBER')),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',

docker-compose.yml

@@ -16,8 +16,8 @@ services:
     container_name: openshift_frontend
     build:
       dockerfile: docker/frontend.dockerfile
-      args:
-        - APP_ENV=local
+    environment:
+      - APP_ENV=local
     volumes:
       - ./:/var/www/public
     working_dir: /var/www/public
@@ -33,17 +33,15 @@ services:
       context: ./
       dockerfile: docker/nginx.dockerfile
     environment:
-       - VIRTUAL_HOST=app.openshift.fss.uu.nl
-       - VIRTUAL_PROTO=http
-       - VIRTUAL_PORT=80
-       - NGINX_HOST=app.openshift.fss.uu.nl
-       - NGINX_PORT=8080
+      - VIRTUAL_HOST=openshift.docker.dev
+      - VIRTUAL_PROTO=http
+      - VIRTUAL_PORT=80
     volumes:
-       - ./:/var/www
-       - ./storage/logs/:/var/log/nginx
+      - ./:/var/www
+      - ./storage/logs/:/var/log/nginx
     networks:
-       - default
-       - hts-appteam-local-dev
+      - default
+      - hts-appteam-local-dev
   mariadb:
     hostname: openshift_mariadb.docker.dev
     container_name: openshift_mariadb
@@ -56,8 +54,8 @@ services:
       MYSQL_USER: "development"
       MYSQL_PASSWORD: "secret"
     networks:
-        - default
-        - hts-appteam-local-dev
+      - default
+      - hts-appteam-local-dev
 networks:
   hts-appteam-local-dev:
-      external: true
+    external: true

docker/backend-entrypoint.sh

@@ -1,16 +1,7 @@
 #!/usr/bin/env bash
 echo "  ⭐️️️️️⭐️️️️️⭐️️️️️⭐️ VERSIE: 1 "
 # run artisan migrate & seed
-ls -la /var/www
-#if [ "$APP_ENV" = "local" ]; then
-#    ## in de dockerfile worden de dev packages verwijderd, dus die moeten we eerst installeren
-#    php composer.phar install
+echo "⭐️ Run artisan migrate";
+php artisan migrate --seed
 
-    echo "⭐️ Run artisan migrate";
-    php artisan migrate --seed
-
-#    echo "⭐️ generate key";
-#    php artisan key:generate
-#fi
-php artisan serve --host=0.0.0.0 --port=8080
-php-fpm
+php-fpm

docker/backend.dockerfile

@@ -10,6 +10,10 @@ RUN apt-get -y dist-upgrade
 RUN apt-get install -y zip
 
 RUN apt-get install -y sudo nano
+RUN apt-get install -y mariadb-client
+
+# install mysql
+RUN docker-php-ext-install pdo_mysql mysqli
 
 # install additional PHP extensions
 RUN  apt-get install -y libmcrypt-dev \
@@ -50,10 +54,6 @@ RUN chmod ugo+x /entrypoint.sh
 
 RUN php artisan optimize
 
-# Expose port 8443 and start php-fpm server
-EXPOSE 8080
-
 ENTRYPOINT /entrypoint.sh
 
 CMD ["php-fpm"]
-

docker/docker.env

@@ -2,14 +2,14 @@ APP_NAME=Openshift
 APP_ENV=acceptance
 APP_KEY=
 APP_DEBUG=true
-APP_URL=https://app.openshift.fss.uu.nl/
+APP_URL=http://openshift.docker.dev
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=mariadb-sample
+DB_HOST=mariadb
 DB_PORT=3306
 DB_DATABASE=development
 DB_USERNAME=development

docker/frontend-entrypoint.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env sh
 
-if [ "$APP_ENV" = "local" ]; then
-    echo "⭐️ Start dev server"
-    npm run dev
-fi
+echo "⭐️ Start dev server"
+npm run dev

docker/vhost.conf

@@ -17,4 +17,4 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
     }
-}
+}

openshift/sample/1_mariadb-secret.yaml → openshift/config/01_mariadb-secret.yaml

@@ -7,5 +7,5 @@ type: Opaque
 data:
   # Use the following command to generate a random password:
   # echo -n 'ChangeThisSuperSecretPassword' | base64
-  mariadb-root-password: c2VjcmV0
-  mariadb-password: c2VjcmV0
+  mariadb-root-password: <mariadb-root-password>
+  mariadb-password: <mariadb-password>

openshift/sample/2_mariadb-cm.yaml → openshift/config/02_mariadb-cm.yaml

@@ -4,5 +4,5 @@ kind: ConfigMap
 metadata:
   name: mariadb-config
 data:
-  mariadb-database: development
-  mariadb-user: development
+  mariadb-database: sample-database
+  mariadb-user: sample-database-user

openshift/sample/4_mariadb-svc.yaml → openshift/config/04_mariadb-svc.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: Service
 metadata:

openshift/config/05_sample-app-cm.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sample-config
+data:
+  database-type: mysql
+  database-host: mariadb-sample
+  database-port-number: '3306'
+  database-name: sample-database

openshift/sample/6_sample-app.yaml → openshift/config/06_sample-app.yaml

@@ -18,9 +18,8 @@ spec:
       containers:
         - name: sample-app
           image: ghcr.io/utrechtuniversity/fsw-openshift:latest
-#          image: bitnami/laravel:latest
           ports:
-            - containerPort: 8080
+            - containerPort: 9000
           env:
             - name: LARAVEL_DATABASE_TYPE
               valueFrom:
@@ -42,11 +41,6 @@ spec:
                 configMapKeyRef:
                   name: sample-config
                   key: database-name
-#            - name: LARAVEL_STORAGE_PATH
-#              valueFrom:
-#                configMapKeyRef:
-#                  name: sample-config
-#                  key: laravel-storage
             - name: LARAVEL_DATABASE_USER
               valueFrom:
                 configMapKeyRef:
@@ -57,19 +51,3 @@ spec:
                 secretKeyRef:
                   name: mariadb-secret
                   key: mariadb-password
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: fsw-sample-app
-  labels:
-    app: fsw-sample-app
-    app.kubernetes.io/part-of: fsw-sample-app
-spec:
-  selector:
-    app: fsw-sample-app
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 8080
----

openshift/config/07_sample-svc.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: sample-app
+  labels:
+    app: fsw-sample-app
+    app.kubernetes.io/part-of: fsw-sample-app
+spec:
+  ports:
+    - port: 9000
+      targetPort: 9000
+  selector:
+    app: sample-app

openshift/config/08_nginx.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx
+  labels:
+    app: fsw-nginx
+    app.kubernetes.io/part-of: fsw-sample-app
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+        - name: nginx
+          image: ghcr.io/utrechtuniversity/nginx:latest
+          ports:
+            - containerPort: 8080