chore: b17s1 merge staging into master

.gitattributes

@@ -0,0 +1,3 @@
+
+Dockerfile  text eol=lf
+*.sh        eol=lf

.github/workflows/ci.yml

@@ -3,120 +3,23 @@ name: CI
 on: [pull_request]
 
 jobs:
-
   build-test:
-    runs-on: windows-latest
-    env:
-      api_keyman_com_host: http://127.0.0.1:8888
-      api_keyman_com_mssql_pw: Password1!
-      api_keyman_com_mssql_user: sa
-      api_keyman_com_mssqlconninfo: sqlsrv:Server=(local)\KEYMANAPI; Database=
-      api_keyman_com_mssql_create_database: true
-      api_keyman_com_mssqldb: keyboards
-      KEYMANHOSTS_TIER: TIER_TEST
+    runs-on: ubuntu-latest
 
     steps:
-
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - name: Setup PHP 7.4
-      uses: shivammathur/setup-php@6972aed899fa2dd4016a7e314c46e6902bcafb7b
-      with:
-        php-version: '7.4'
-        extensions: curl, intl, mbstring, openssl
-        coverage: none
+    - name: Build the Docker image
+      shell: bash
+      run: |
+        echo "TIER_TEST" > tier.txt
+        ./build.sh build start
       env:
         fail-fast: true
 
-    #
-    # Configure IIS and setup site for running unit tests
-    #  * Installs IIS, CGI extensions, URLRewrite and configures to connect to PHP
-    #  * Sets up http://127.0.0.1:8888 as host for tests
-    #  * Enables detailed error reporting
-    #
-    - name: Download and install IIS and setup a local website
-      shell: powershell
-      run: |
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole -NoRestart
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-CGI -NoRestart
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-ISAPIExtensions -NoRestart
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-ISAPIFilter -NoRestart
-        Choco-Install -PackageName urlrewrite -ArgumentList "--no-progress"
-        Import-Module WebAdministration
-        New-WebAppPool -name "NewWebSiteAppPool"  -force
-        New-WebSite -name "NewWebSite" -PhysicalPath "$ENV:GITHUB_WORKSPACE" -ApplicationPool "NewWebSiteAppPool" -port 8888 -force
-        Set-WebConfigurationproperty -filter "system.webServer/httpErrors" -pspath "MACHINE/WEBROOT/APPHOST" -name errorMode -value Detailed
-
-    #
-    # This step configures FastCGI according to the documentation at https://www.php.net/manual/en/install.windows.manual.php
-    # This alternative doesn't work: New-WebHandler -name "PHP" -Path *.php -Modules FastCgiModule -ScriptProcessor "c:\tools\php\php-cgi.exe" -Verb 'GET,POST' -Force
-    #
-    - name: Setup FastCGI
-      shell: cmd
-      run: |
-        set phpdir=c:\tools
-        set phppath=php
-
-        REM Clear current PHP handlers
-        %windir%\system32\inetsrv\appcmd clear config /section:system.webServer/fastCGI
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/handlers /-[name='PHP_via_FastCGI']
-
-        REM Set up the PHP handler
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/fastCGI /+[fullPath='%phpdir%\%phppath%\php-cgi.exe']
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/handlers /+[name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='%phpdir%\%phppath%\php-cgi.exe',resourceType='Unspecified']
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/handlers /accessPolicy:Read,Script
-
-        REM Configure FastCGI Variables
-        %windir%\system32\inetsrv\appcmd set config -section:system.webServer/fastCgi /[fullPath='%phpdir%\%phppath%\php-cgi.exe'].instanceMaxRequests:10000
-        %windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi /+"[fullPath='%phpdir%\%phppath%\php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']"
-        %windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi /+"[fullPath='%phpdir%\%phppath%\php-cgi.exe'].environmentVariables.[name='PHPRC',value='%phpdir%\%phppath%\php.ini']"
-
-    #
-    # Write environment to localenv.php (so PHP under IIS can see it as env is not available)
-    #
-    - name: Setup localenv.php
-      shell: cmd
-      run: |
-        echo ^<?php > tools\db\localenv.php
-        echo $mssqlpw='%api_keyman_com_mssql_pw%'; >> tools\db\localenv.php
-        echo $mssqluser='%api_keyman_com_mssql_user%'; >> tools\db\localenv.php
-        echo $mssqldb = '%api_keyman_com_mssqldb%'; >> tools\db\localenv.php
-        echo $mssqlconninfo='%api_keyman_com_mssqlconninfo%'; >> tools\db\localenv.php
-        echo $mssql_create_database = true; >> tools\db\localenv.php
-
-    #
-    # Install SQL Server Developer Edition with FullText Search module
-    #
-    - name: Download and install SQL Server Express
-      shell: powershell
-      run: |
-        Choco-Install -PackageName sql-server-2019 -ArgumentList "--no-progress", "--params", "'/IGNOREPENDINGREBOOT /INSTANCEID=KEYMANAPI /INSTANCENAME=KEYMANAPI /SAPWD=Password1! /SECURITYMODE=SQL /UPDATEENABLED=FALSE /FEATURES=SQLENGINE,FULLTEXT'"
-
-    #
-    # Install website PHP dependencies
-    #
-    - name:  Install dependencies
-      shell: cmd
-      run:   composer install --no-progress
-
-    #
-    # Install PHP SQL Server PDO Driver
-    #  * Copy driver to PHP extensions
-    #  * Configure extension
-    #  * Allow PHP errors to be displayed
-    #
-    - name:  Install PHP SQL Server PDO Driver
-      shell: powershell
+    - name: Run tests
+      shell: bash
       run: |
-        Invoke-WebRequest -outfile pdo.zip https://github.com/microsoft/msphpsql/releases/download/v5.8.0/Windows-7.4.zip
-        Expand-Archive pdo.zip -DestinationPath pdo\
-        copy pdo\Windows-7.4\x64\php_pdo_sqlsrv_74_nts.dll c:\tools\php\ext\
-        Add-Content -path c:\tools\php\php.ini -value '','extension=php_pdo_sqlsrv_74_nts.dll','mssql.secure_connection=Off','display_errors = On','upload_tmp_dir = c:\tools\php\tmp'
+        ./build.sh test
 
-    #
-    # Finally, run the unit tests!
-    #
-    - name:  Run unit tests
-      shell: cmd
-      run:   composer test

.github/workflows/cleanup.yml

@@ -0,0 +1,57 @@
+name: Prune images
+on:
+  workflow_run:
+    workflows: [Docker-build]
+    types: [completed]
+
+jobs:
+  prune:
+    runs-on: ubuntu-latest
+    steps:
+    - name: prune-staging-api
+      uses: vlaurin/[email protected]
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-app
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: staging
+        prune-untagged: true
+
+    - name: prune-staging-db
+      uses: vlaurin/[email protected]
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-db
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: staging
+        prune-untagged: true
+
+    - name: prune-production-api
+      uses: vlaurin/[email protected]
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-app
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: master
+        prune-untagged: true
+
+    - name: prune-production-db
+      uses: vlaurin/[email protected]
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-db
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: master
+        prune-untagged: true

.github/workflows/docker.yml

@@ -0,0 +1,84 @@
+name: Docker-build
+on:
+  push:
+    branches: [ "master", "staging" ]
+    paths:
+    - .github/**
+    - composer.*
+    - resources/**
+    - "*Dockerfile"
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: keymanapp/api-keyman-com
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      # Login against a Docker registry except on PR
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for PHP container
+      - name: Extract Docker metadata for PHP runtime
+        id: meta-app
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app
+          tags: |
+            type=raw,value={{branch}}
+            type=raw,value=latest
+          labels: |
+            org.opencontainers.image.description=PHP api runtime
+
+      # Extract metadata (tags, labels) for sqlserver container
+      - name: Extract Docker metadata for SQLServer container
+        id: meta-db
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-db
+          tags: |
+            type=raw,value={{branch}}
+            type=raw,value=latest
+          labels: |
+            org.opencontainers.image.description=SQLServer
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      - name: Build and push Docker image for PHP runtime
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-app.outputs.tags }}
+          labels: ${{ steps.meta-app.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      - name: Build and push Docker image for SQLServer containe
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: mssql.Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-db.outputs.tags }}
+          labels: ${{ steps.meta-db.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.gitignore

@@ -1,6 +1,11 @@
 /.data/
 **/.idea/**/*.xml
 **/*.iml
-/vendor/
+vendor*
 /node_modules/
 .vscode/
+
+# Shared files are bootstrapped:
+resources/bootstrap.inc.sh
+resources/.bootstrap-version
+_common/