Merge branch 'release/8.x' into hotfix/DQA-3575

ec-europa · Feb 23, 2022 · 02ef35a · 02ef35a
2 parents b1bc30d + 178f74e
commit 02ef35a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php:8.1-dev
+    image: registry.fpfis.eu/fpfis/httpd-php:8.1-dev
     working_dir: ${PWD}
     volumes:
     - ${PWD}:${PWD}

diff --git a/tests/fixtures/commands/build.yml b/tests/fixtures/commands/build.yml
@@ -16,7 +16,7 @@
             ->exec('mkdir -p web/sites/default/private_files')
             ->exec('chmod ug=rwx,o= web/sites/default/private_files')
         [Simulator] Simulating Filesystem\FilesystemStack()
-            ->copy('resources/Drush/drush.yml.dist', 'web/sites/all/drush/drush.yml')
+            ->copy(1, 'web/sites/all/drush/drush.yml')
 
 - command: 'toolkit:build-dist --root=web --dist-root=dist --tag=1.0.0 --sha=aBcDeF --keep=vendor --remove=CHANGELOG.txt'
   configuration:
@@ -47,7 +47,7 @@
         [Simulator] Simulating File\Write('dist/web/VERSION.txt')
             ->text('1.0.0')
         [Simulator] Simulating Filesystem\FilesystemStack()
-            ->copy('resources/Drush/drush.yml.dist', 'dist/web/sites/all/drush/drush.yml')
+            ->copy(1, 'dist/web/sites/all/drush/drush.yml')
         [Simulator] Simulating ExecStack()
             ->exec('find dist -maxdepth 3 -type f \( -name "CHANGELOG.txt" \) -exec rm -rf {} +')