Skip to content

Commit

Permalink
update deps and GHA
Browse files Browse the repository at this point in the history
  • Loading branch information
tobybellwood committed Sep 11, 2024
1 parent ef7a5b4 commit 486e314
Show file tree
Hide file tree
Showing 4 changed files with 398 additions and 126 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/build-base-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
push:
branches:
- 'main'
- 'test_build'
tags:
- '*'

jobs:
build:
Expand Down Expand Up @@ -40,6 +41,18 @@ jobs:
nginx.tags=ghcr.io/${{ github.repository_owner }}/drupal-base-image/nginx:latest
php.tags=ghcr.io/${{ github.repository_owner }}/drupal-base-image/php:latest
- name: Build and push remote (tag)
if: ${{ github.ref_type == 'tag' }}
uses: docker/bake-action@v5
with:
push: true
set: |
*.platform=linux/amd64,linux/arm64
cli.tags=ghcr.io/${{ github.repository_owner }}/drupal-base-image/cli:${{ github.ref_name }}
nginx.tags=ghcr.io/${{ github.repository_owner }}/drupal-base-image/nginx:${{ github.ref_name }}
php.tags=ghcr.io/${{ github.repository_owner }}/drupal-base-image/php:${{ github.ref_name }}
- name: List images
run: docker image ls

Expand All @@ -54,4 +67,4 @@ jobs:
php.tags=drupal-base-php:latest
- name: List images
run: docker image ls
run: docker image ls
7 changes: 6 additions & 1 deletion .lagoon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,20 @@ tasks:
command: |
if [[ $(drush status --field=Database) == "Connected" ]]; then drush -y updb; fi
service: cli
shell: bash
# - run:
# name: drush cim
# # Enable once config sync has been setup.
# command: drush -y cim
# service: cli
# shell: bash
- run:
name: drush cr
command: drush -y cr
# This will only run if the database exists.
command: |
if [[ $(drush status --field=Database) == "Connected" ]]; then drush -y cr; fi
service: cli
shell: bash

environments:
main:
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,20 @@
"drupal/core-project-message": "10.3.3",
"drupal/core-recommended": "10.3.3",
"drupal/lagoon_logs": "3.0.1",
"drush/drush": "12.5.3",
"zaporylie/composer-drupal-optimizations": "1.2.0"
"drush/drush": "13.1.1"
},
"conflict": {
"drupal/drupal": "*"
},
"minimum-stability": "dev",
"prefer-stable": true,
"config":{
"platform": {"php": "8.1.12"},
"sort-packages": true,
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"drupal/core-composer-scaffold": true,
"drupal/core-project-message": true,
"zaporylie/composer-drupal-optimizations": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpstan/extension-installer": true,
"php-http/discovery": true
Expand Down
Loading

0 comments on commit 486e314

Please sign in to comment.