Merge branch 'ucfopen:main' into main

Author: mbusch3

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
         php-versions: ['8.2']
         node-version: [16.19.0]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Log in to the Container registry
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
@@ -34,27 +34,27 @@ jobs:
         uses: ASzc/change-string-case-action@v2
         with:
           string: ${{ github.repository }}
-      
+
       - name: Display repository name
         run: echo ${{ steps.case.outputs.lowercase }}
 
       - name: Find-and-replace strings
         id: slash
         uses: mad9000/actions-find-and-replace-string@2
         with:
-          source: ${{ github.ref_name }} 
-          find: '/' 
-          replace: '-'   
+          source: ${{ github.ref_name }}
+          find: '/'
+          replace: '-'
 
       - name: Display issue name
-        run: echo ${{ steps.slash.outputs.value }}      
+        run: echo ${{ steps.slash.outputs.value }}
 
       - name: Build Image
         run: |
           cp .env.example .env
           docker compose -f docker-compose.nginx.yml build
           docker compose -f docker-compose.nginx.yml run composer composer install --no-dev --no-interaction --no-progress --optimize-autoloader
-          docker compose -f docker-compose.nginx.yml run yarn bash -c 'cd /app && yarn install && yarn build'        
+          docker compose -f docker-compose.nginx.yml run yarn bash -c 'cd /app && yarn install && yarn build'
           docker build . -t udoit:latest -f build/nginx/Dockerfile.build
           docker tag udoit:latest ${{ env.REGISTRY }}/${{ steps.case.outputs.lowercase }}:${{ steps.slash.outputs.value }}
 

.github/workflows/udoit.yml

@@ -35,7 +35,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: php-${{ matrix.php-versions }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -54,7 +54,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,10 +76,10 @@ jobs:
           DATABASE_URL: postgresql://udoit:[email protected]:5432/udoit?serverVersion=11&charset=utf8
         run: |
           sudo systemctl start postgresql.service
-          sudo -u postgres psql -c "CREATE DATABASE udoit;" 
-          sudo -u postgres psql -c "CREATE USER udoit WITH PASSWORD 'udoit';" 
-          sudo -u postgres psql -c "ALTER USER udoit WITH SUPERUSER;" 
-          sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE "udoit" TO udoit;" 
+          sudo -u postgres psql -c "CREATE DATABASE udoit;"
+          sudo -u postgres psql -c "CREATE USER udoit WITH PASSWORD 'udoit';"
+          sudo -u postgres psql -c "ALTER USER udoit WITH SUPERUSER;"
+          sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE "udoit" TO udoit;"
           php bin/console doctrine:migrations:migrate
 
       - name: Create and populate MySQL database

build/nginx/Dockerfile.build

@@ -4,7 +4,7 @@ RUN apt-get update -y \
     && apt-get install -y nginx libpng-dev zlib1g-dev git unzip
 
 # PHP_CPPFLAGS are used by the docker-php-ext-* scripts
-ENV PHP_CPPFLAGS="$PHP_CPPFLAGS -std=c++11"
+ENV PHP_CPPFLAGS="$PHP_CPPFLAGS -std=c++17"
 
 RUN docker-php-ext-install pdo_mysql gd pdo \
     && docker-php-ext-install opcache \

build/nginx/Dockerfile.composer

@@ -1,5 +1,5 @@
-FROM composer
+FROM composer:2.6.4
 
 RUN apk add gd-dev libpng-dev
 RUN docker-php-ext-install gd
-WORKDIR /app
+WORKDIR /app