diff --git a/.github/workflows/docker-image-Laravel.yml b/.github/workflows/docker-image-Laravel.yml new file mode 100644 index 0000000..23a9a91 --- /dev/null +++ b/.github/workflows/docker-image-Laravel.yml @@ -0,0 +1,37 @@ +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 }} + COMPOSER_TOKEN: ${{ secrets.ACCESS_TOKEN_GITHUB }} + COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{secrets.ACCESS_TOKEN_GITHUB}}"} }' # [tl! **] + GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN_GITHUB }} +on: + push: + branches: [ "master", "develop", "feature/da_add_la_basepackage"] + 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 develop + 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 }} \ No newline at end of file diff --git a/.github/workflows/docker-image-Nginx.yml b/.github/workflows/docker-image-Nginx.yml new file mode 100644 index 0000000..f6cfed7 --- /dev/null +++ b/.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 }} \ No newline at end of file diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index ba997dc..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file docker/backend.dockerfile --tag my-image-name:$(date +%s) diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index 455cec1..b64ebd1 100644 --- a/.github/workflows/openshift.yml +++ b/.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 diff --git a/DEMO.md b/DEMO.md new file mode 100644 index 0000000..8fdd729 --- /dev/null +++ b/DEMO.md @@ -0,0 +1,36 @@ +## DEMO FSW-Openshift + +https://docs.cp.its.uu.nl/ + +https://github.com/UtrechtUniversity/containerplatform-docs + +`sshuttle --r shell 131.211.0.0/16` + +https://console.cp.its.uu.nl/ + +https://github.com/UtrechtUniversity/FSW-Openshift + +https://github.com/UtrechtUniversity/FSW-Openshift/pkgs/container/fsw-openshift + +https://github.com/UtrechtUniversity/wordpress-example-app + +local testing: + https://www.redhat.com/sysadmin/codeready-containers +Console: + https://console-openshift-console.apps-crc.testing + + + +CNAME ingress.cp.its.uu.nl +solid.net.uu.nl + +wp.openshift.fss.uu.nl +app.openshift.fss.uu.nl +laravel.openshift.fss.uu.nl + +registry.cp.its.uu.nl + +app grouperen met labels. + +desktop init: https://medium.com/@bisinet/simplify-application-dockerization-with-docker-init-6bc4c99db26f + diff --git a/README.md b/README.md index 1a4c26b..d442926 100644 --- a/README.md +++ b/README.md @@ -1,66 +1,21 @@ -
+## About FSW-Openshift - +A first default laravel project with openshift. -## About Laravel +local testing: +https://www.redhat.com/sysadmin/codeready-containers -Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as: +`crc start -p /- Laravel has wonderful documentation covering every aspect of the framework. Whether you are a newcomer or have prior experience with Laravel, we recommend reading our documentation from beginning to end. -
-- Laracasts offers thousands of video tutorials on Laravel, PHP, and JavaScript development. Check them out, see for yourself, and massively level up your development skills in the process. -
+@extends('layouts.app') + +@section('content') +- Laravel News is a community driven portal and newsletter aggregating all of the latest and most important news in the Laravel ecosystem, including new package releases and tutorials. -
-