Skip to content
This repository was archived by the owner on Mar 9, 2021. It is now read-only.

Commit cf0685c

Browse files
stooitsteveworley
andauthored
Release/1.3.0 (#51)
* [GOVCMS-4392]: Update the deploy process. (#41) * Update the deploy process. - Align the deploy process with the scaffold tooling approach. GovCMS base images now include the scaffold-tooling dependency, this installs deploy scripts to the /app/vendor/bin directory and will allow us to align approaches and centrally manage updates to the deployment process. * Update script names to match naming convention. * Update the govcms commands in lagoon.yml. - Change to match the naming convention of `govcms-[object]-[action]` govCMS/scaffold-tooling#33 * Ensure command files are available. - Pre-deploy scripts run in existing containers, the atomic govcms deploy scripts may not always be available. * Message was causing errors in Lagoon. * Update README.md * Added support for config workflow env var in local/ci. (#50) Aligned govcms-deploy process to standard scripts. * Automated testing synchronisation (#38) * Add the screenshots directory. Co-authored-by: steveworley <sj.worley88@gmail.com.au> * [GOVCMS-3727]: Add validate steps to post-deploy tasks. (#49) * Add a elevated permissions check to post rollout. * Add theme linting to post deploy. * 1.3.0 release. Co-authored-by: Steve <sj.worley88@gmail.com>
1 parent 7033107 commit cf0685c

File tree

7 files changed

+25
-3
lines changed

7 files changed

+25
-3
lines changed

.ahoy.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ commands:
3333

3434
govcms-deploy:
3535
usage: Runs deployment commands (config import, updb, cr, set up file_stage_proxy)
36-
cmd: docker-compose exec -T cli govcms-deploy
36+
cmd: |
37+
docker-compose exec -T cli /app/vendor/bin/govcms-db-update && \
38+
docker-compose exec -T cli /app/vendor/bin/govcms-config-import && \
39+
docker-compose exec -T cli /app/vendor/bin/govcms-cache-rebuild && \
40+
docker-compose exec -T cli /app/vendor/bin/govcms-enable_modules
3741
3842
drush:
3943
usage: Run drush commands in cli container.

.env.default

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,7 @@ X_FRAME_OPTIONS=SameOrigin
4343
# variable set via GraphQL api.
4444
# @see progress https://github.com/amazeeio/lagoon/issues/1168
4545
#GOVCMS_IMAGE_VERSION=latest
46+
47+
# Configuration management strategy (local/CI only).
48+
# https://govcms.gov.au/wiki-vars#GOVCMS_DEPLOY_WORKFLOW_CONFIG
49+
GOVCMS_DEPLOY_WORKFLOW_CONFIG=import

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/files
2-
screenshots
2+
tests/behat/screenshots/*
3+
!tests/behat/screenshots/.gitkeep

.lagoon.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@ tasks:
4343
command: /app/vendor/bin/govcms-update_site_alias
4444
service: cli
4545
shell: bash
46+
- run:
47+
name: Prevent elevated permissions
48+
command: /app/vendor/bin/govcms-validate-permissions
49+
service: cli
50+
shell: bash
51+
- run:
52+
name: Validate theme YAML files
53+
command: /app/vendor/bin/govcms-validate-theme-yml
54+
service: cli
55+
shell: bash
4656
- run:
4757
name: Synchronise the database
4858
command: /app/vendor/bin/govcms-db-sync

.version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version: 8
22
type: saas
3-
scaffold: 1.2.0
3+
scaffold: 1.3.0

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ x-volumes:
1515
- ./themes:/app/web/themes/custom:${VOLUME_FLAGS:-delegated}
1616
- ./files:/app/web/sites/default/files:delegated
1717
- ./tests/behat/features:/app/tests/behat/features:${VOLUME_FLAGS:-delegated}
18+
- ./tests/behat/screenshots:/app/tests/behat/screenshots:${VOLUME_FLAGS:-delegated}
1819
- ./tests/phpunit/tests:/app/tests/phpunit/tests:${VOLUME_FLAGS:-delegated}
1920
- ./config:/app/config
2021

@@ -30,6 +31,7 @@ x-environment:
3031
# Allow to override docker host used from the inside of the containers.
3132
DOCKERHOST: ${DOCKERHOST:-}
3233
XDEBUG_ENABLE: ${XDEBUG_ENABLE:-}
34+
GOVCMS_DEPLOY_WORKFLOW_CONFIG: ${GOVCMS_DEPLOY_WORKFLOW_CONFIG:-import}
3335

3436
services:
3537

tests/behat/screenshots/.gitkeep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)