Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .docker/Dockerfile.govcms8
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ARG GITHUB_TOKEN

COPY composer.* /app/

# Copy base file for extensible saas.
COPY custom /app/custom

# Install yq for YAML parsing.
RUN wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64" \
&& chmod +x /usr/local/bin/yq
Expand All @@ -27,8 +30,6 @@ ENV COMPOSER_MEMORY_LIMIT=-1
# Set the Github OAuth token only when the variable is set.
RUN [[ ! -z "${GITHUB_TOKEN}" ]] && composer config -g github-oauth.github.com ${GITHUB_TOKEN} || echo "Personal Github OAuth token is not set."
RUN composer install -d /app \
# Force drupal-scaffold to run to ensure that the needed files are always created, even if a composer.lock is provided
&& composer drupal-scaffold \
&& composer clearcache

COPY .docker/sanitize.sh /app/sanitize.sh
Expand Down
22 changes: 8 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,22 @@
{
"type": "vcs",
"url": "git@github.com:govCMS/scaffold-tooling.git"
},
{
"type": "path",
"url": "custom/composer"
}
],
"require": {
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"drupal-composer/drupal-scaffold": "^2.5",
"govcms/govcms": "^1.0",
"govcms/scaffold-tooling": "^2.0",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
"drupal/core-recommended": "^8.8",
"symfony/event-dispatcher": "4.3.11 as 3.4.41",
"zaporylie/composer-drupal-optimizations": "^1.0",
"govcms/scaffold-tooling": "^2.0"
"symfony/event-dispatcher": "4.3.11 as 3.4.41",
"govcms/govcms-custom": "*"
},
"require-dev": {
"phpunit/phpunit": "^6.5"
Expand Down Expand Up @@ -64,17 +67,14 @@
],
"post-update-cmd": [
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
],
"drupal-scaffold": [
"DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
]
},
"extra": {
"patchLevel": {
"drupal/core": "-p2"
},
"enable-patching": true,
"patches": {},
"patches-file": "custom/composer/patches.json",
"installer-types": ["bower-asset", "npm-asset"],
"installer-paths": {
"web/core": [
Expand All @@ -95,12 +95,6 @@
"drush/Commands/{$name}": [
"type:drupal-drush"
]
},
"drupal-scaffold": {
"initial": {
".editorconfig": "../.editorconfig",
".gitattributes": "../.gitattributes"
}
}
}
}
6 changes: 6 additions & 0 deletions custom/composer/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "govcms/govcms-custom",
"description": "Provides additional packages over the GovCMS base distribution.",
"require": {
}
}
4 changes: 4 additions & 0 deletions custom/composer/patches.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"patches": {
}
}