Merge branch 'release/1.3.0'

os2display · Jul 11, 2023 · 1158e2f · 1158e2f
2 parents 139ce43 + 16260a8
commit 1158e2f
Show file tree

Hide file tree

Showing 98 changed files with 2,613 additions and 1,441 deletions.
diff --git a/.github/workflows/github_build_release.yml b/.github/workflows/github_build_release.yml
@@ -0,0 +1,45 @@
+on:
+  push:
+    tags:
+      - '*.*.*'
+
+name: Create Github Release
+
+permissions:
+  contents: write
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    env:
+      COMPOSER_ALLOW_SUPERUSER: 1
+      APP_ENV: prod
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Composer install
+        run: |
+          docker network create frontend
+          docker compose run --rm phpfpm composer install --no-dev -o --classmap-authoritative
+          docker compose run --rm phpfpm composer clear-cache
+          rm -rf infrastructure
+
+      - name: Make assets dir
+        run: |
+          mkdir -p ../assets
+
+      - name: Create archive
+        run: |
+          tar \
+            -zcf ../assets/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz ./*
+
+      - name: Create checksum
+        run: sha256sum ../assets/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz > ../assets/checksum.txt
+
+      - name: Create a release in GitHub and uploads assets
+        run: |
+          gh release create ${{ github.ref_name }} --verify-tag --generate-notes ../assets/*.*
+        env:
+          GITHUB_TOKEN: ${{ github.TOKEN }}
+        shell: bash
diff --git a/.github/workflows/docker_build_develop.yml → ...workflows/itkdev_docker_build_develop.yml b/.github/workflows/docker_build_develop.yml → ...workflows/itkdev_docker_build_develop.yml
@@ -3,13 +3,16 @@ on:
   push:
     branches:
       - 'develop'
-name: Build docker image (develop)
+
+# This Action builds to itkdev/* using ./infrastructure/itkdev/*
+name: ITK Dev - Build docker image (develop)
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     env:
       APP_VERSION: develop
+      COMPOSER_ALLOW_SUPERUSER: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -30,8 +33,8 @@ jobs:
       - name: Build and push (API)
         uses: docker/build-push-action@v4
         with:
-          context: ./infrastructure/display-api-service/
-          file: ./infrastructure/display-api-service/Dockerfile
+          context: ./infrastructure/itkdev/display-api-service/
+          file: ./infrastructure/itkdev/display-api-service/Dockerfile
           build-args: |
             VERSION=${{ env.APP_VERSION }}
           push: true
@@ -48,8 +51,8 @@ jobs:
       - name: Build and push (Nginx)
         uses: docker/build-push-action@v4
         with:
-          context: ./infrastructure/nginx/
-          file: ./infrastructure/nginx/Dockerfile
+          context: ./infrastructure/itkdev/nginx/
+          file: ./infrastructure/itkdev/nginx/Dockerfile
           build-args: |
             APP_VERSION=${{ env.APP_VERSION }}
           push: true

diff --git a/.github/workflows/docker_build_tag.yml → ...hub/workflows/itkdev_docker_build_tag.yml b/.github/workflows/docker_build_tag.yml → ...hub/workflows/itkdev_docker_build_tag.yml
@@ -3,11 +3,15 @@ on:
   push:
     tags:
       - '*'
-name: Build docker image (tag)
+
+# This Action builds to itkdev/* using ./infrastructure/itkdev/*
+name: ITK Dev - Build docker image (tag)
 
 jobs:
   docker:
     runs-on: ubuntu-latest
+    env:
+      COMPOSER_ALLOW_SUPERUSER: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -28,8 +32,8 @@ jobs:
       - name: Build and push (API)
         uses: docker/build-push-action@v4
         with:
-          context: ./infrastructure/display-api-service/
-          file: ./infrastructure/display-api-service/Dockerfile
+          context: ./infrastructure/itkdev/display-api-service/
+          file: ./infrastructure/itkdev/display-api-service/Dockerfile
           build-args: |
             APP_VERSION=${{ github.ref }}
           push: true
@@ -50,8 +54,8 @@ jobs:
       - name: Build and push (Nginx)
         uses: docker/build-push-action@v4
         with:
-          context: ./infrastructure/nginx/
-          file: ./infrastructure/nginx/Dockerfile
+          context: ./infrastructure/itkdev/nginx/
+          file: ./infrastructure/itkdev/nginx/Dockerfile
           build-args: |
             APP_VERSION=${{ steps.get_tag.outputs.git_tag }}
           push: true

diff --git a/.github/workflows/os2display_docker_build_develop.yml b/.github/workflows/os2display_docker_build_develop.yml
@@ -0,0 +1,60 @@
+---
+on:
+  push:
+    branches:
+      - 'develop'
+
+# This Action builds to os2display/* using ./infrastructure/os2display/*
+name: OS2display - Build docker image (develop)
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    env:
+      APP_VERSION: develop
+      COMPOSER_ALLOW_SUPERUSER: 1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Build api
+      - name: Docker meta (API)
+        id: meta-api
+        uses: docker/metadata-action@v4
+        with:
+          images: os2display/display-api-service
+
+      - name: Build and push (API)
+        uses: docker/build-push-action@v4
+        with:
+          context: ./infrastructure/os2display/display-api-service/
+          file: ./infrastructure/os2display/display-api-service/Dockerfile
+          build-args: |
+            VERSION=${{ env.APP_VERSION }}
+          push: true
+          tags: ${{ steps.meta-api.outputs.tags }}
+          labels: ${{ steps.meta-api.outputs.labels }}
+
+      # Build nginx (depends on api build)
+      - name: Docker meta (Nginx)
+        id: meta-nginx
+        uses: docker/metadata-action@v4
+        with:
+          images: os2display/display-api-service-nginx
+
+      - name: Build and push (Nginx)
+        uses: docker/build-push-action@v4
+        with:
+          context: ./infrastructure/os2display/nginx/
+          file: ./infrastructure/os2display/nginx/Dockerfile
+          build-args: |
+            APP_VERSION=${{ env.APP_VERSION }}
+          push: true
+          tags: ${{ steps.meta-nginx.outputs.tags }}
+          labels: ${{ steps.meta-nginx.outputs.labels }}
diff --git a/.github/workflows/os2display_docker_build_tag.yml b/.github/workflows/os2display_docker_build_tag.yml
@@ -0,0 +1,63 @@
+---
+on:
+  push:
+    tags:
+      - '*'
+
+# This Action builds to os2display/* using ./infrastructure/os2display/*
+name: OS2display - Build docker image (tag)
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    env:
+      COMPOSER_ALLOW_SUPERUSER: 1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Build api
+      - name: Docker meta (API)
+        id: meta-api
+        uses: docker/metadata-action@v4
+        with:
+          images: os2display/display-api-service
+
+      - name: Build and push (API)
+        uses: docker/build-push-action@v4
+        with:
+          context: ./infrastructure/os2display/display-api-service/
+          file: ./infrastructure/os2display/display-api-service/Dockerfile
+          build-args: |
+            APP_VERSION=${{ github.ref }}
+          push: true
+          tags: ${{ steps.meta-api.outputs.tags }}
+          labels: ${{ steps.meta-api.outputs.labels }}
+
+      # Build nginx (depends on api build)
+      - name: Docker meta (Nginx)
+        id: meta-nginx
+        uses: docker/metadata-action@v4
+        with:
+          images: os2display/display-api-service-nginx
+
+      - name: Get the tag
+        id: get_tag
+        run: echo ::set-output name=git_tag::$(echo $GITHUB_REF_NAME)
+
+      - name: Build and push (Nginx)
+        uses: docker/build-push-action@v4
+        with:
+          context: ./infrastructure/os2display/nginx/
+          file: ./infrastructure/os2display/nginx/Dockerfile
+          build-args: |
+            APP_VERSION=${{ steps.get_tag.outputs.git_tag }}
+          push: true
+          tags: ${{ steps.meta-nginx.outputs.tags }}
+          labels: ${{ steps.meta-nginx.outputs.labels }}
diff --git a/.github/workflows/php_upgrade.yaml b/.github/workflows/php_upgrade.yaml
@@ -1,8 +1,10 @@
 on: pull_request
-name: Upgrade
+name: PHP Upgrade Check
 jobs:
   test-composer-install:
     runs-on: ubuntu-latest
+    env:
+      COMPOSER_ALLOW_SUPERUSER: 1
     strategy:
       fail-fast: false
       matrix:
@@ -91,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mariadb:
-        image: mariadb:latest
+        image: mariadb:lts
         ports:
           - 3306
         env:

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -1,8 +1,10 @@
 on: pull_request
-name: Review
+name: Pull Request Review
 jobs:
   test-composer-install:
     runs-on: ubuntu-latest
+    env:
+      COMPOSER_ALLOW_SUPERUSER: 1
     strategy:
       fail-fast: false
       matrix:
@@ -141,7 +143,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mariadb:
-        image: mariadb:latest
+        image: mariadb:lts
         ports:
           - 3306
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,30 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.3.0] - 2023-07-11
+- [#155](https://github.com/os2display/display-api-service/pull/155)
+  Set up separate image builds for itkdev and os2display
+- [#154](https://github.com/os2display/display-api-service/pull/154)
+  Updated add user command to ask which tenants user belongs to
+- [#151](https://github.com/os2display/display-api-service/pull/151)
+  Fixed feed data provider id issue
+- [#150](https://github.com/os2display/display-api-service/pull/150)
+  Update docker build to publish to "os2display" org on docker hub. Update github workflow to latest actions.
+- [#148](https://github.com/os2display/display-api-service/pull/148)
+  Updated `EventDatabaseApiFeedType` query ensuring started
+  but not finished events are found.
+- [#157](https://github.com/os2display/display-api-service/pull/157)
+  Refactored all feed related classes and services
+- Minor update of composer packages
+- Updated psalm to version 5.x
+
+## [1.2.9] - 2023-06-30
+
+- [#153](https://github.com/os2display/display-api-service/pull/153)
+  Fixed nginx entry script
+
 ## [1.2.8] - 2023-05-25
+
 - [#145](https://github.com/os2display/display-api-service/pull/145)
 Gif mime type possible.
 

diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "friendsofphp/php-cs-fixer": "^3.0",
         "hautelook/alice-bundle": "^2.9",
         "phpunit/phpunit": "^9.5",
-        "psalm/plugin-symfony": "^3.0",
+        "psalm/plugin-symfony": "^5.0",
         "symfony/browser-kit": "5.4.*",
         "symfony/css-selector": "5.4.*",
         "symfony/debug-bundle": "5.4.*",
@@ -57,8 +57,8 @@
         "symfony/stopwatch": "^5.3",
         "symfony/var-dumper": "^5.3",
         "symfony/web-profiler-bundle": "^5.3",
-        "vimeo/psalm": "^4.8",
-        "weirdan/doctrine-psalm-plugin": "^1.1"
+        "vimeo/psalm": "^5.12.0",
+        "weirdan/doctrine-psalm-plugin": "^2.0"
     },
     "replace": {
         "symfony/polyfill-ctype": "*",