Docker Build Again

.github/workflows/devshop.yml

@@ -11,7 +11,7 @@ on:
 env:
   # Set ANSIBLE_VERBOSITY to 1,2 or 3 when needed for development.
   ANSIBLE_VERBOSITY: 0
-  DEBUG_COMMAND: "docker-compose exec -T container systemctl status --no-pager"
+  DEBUG_COMMAND: "docker-compose exec -T devshop.server systemctl status --no-pager"
   GITHUB_TOKEN: ${{ secrets.INPUT_GITHUB_TOKEN }}
   GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
   GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha  }}
@@ -23,9 +23,13 @@ env:
   DOCKER_COMMAND_POST: "echo 'GitHub Actions Container was launched.'"
 
   # Load vars from the vars.ci.yml file.
+  ANSIBLE_PLAYBOOK_COMMAND_OPTIONS_ARG: "--extra-vars=@/usr/share/devshop/vars.ci.yml"
   ANSIBLE_PLAYBOOK_COMMAND_OPTIONS: "--extra-vars=@/usr/share/devshop/vars.ci.yml"
   GIT_REF: 1.x
 
+  # Prevents including docker-compose.override, which is for local development.
+  COMPOSE_FILE: docker-compose.yml
+
 jobs:
   docker:
     name: "Build DevShop"
@@ -40,13 +44,14 @@ jobs:
 
         os:
           - 'ubuntu1804'
-          - 'ubuntu2004'
+#          - 'ubuntu2004'
     env:
       OS: "${{ matrix.os }}"
+      DEVSHOP_DOCKER_IMAGE:  "devshop/server:${{ matrix.os }}"
       HOSTNAME: "devshop.${{ github.event.pull_request.number }}.${{ matrix.os }}.actions.github.com"
       ANSIBLE_EXTRA_VARS: "${{ matrix.vars }}"
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       # By default, actions/checkout uses the current SHA for the branch it is testing. See on.push.branches: 1.x
       # https://github.com/opendevshop/devshop/runs/1517209717?check_suite_focus=true#step:2:465
@@ -70,42 +75,45 @@ jobs:
           echo "devshop_version: ${{ github.head_ref }}" >> vars.ci.yml
           echo "devshop_cli_repo: ${{ github.event.pull_request.head.repo.clone_url }}" >> vars.ci.yml
           echo "GIT_REF=${{ github.head_ref }}" >> $GITHUB_ENV
+          echo "ANSIBLE_VERBOSITY=2" >> $GITHUB_ENV
           git switch --create ${{ github.head_ref }}
 # If you need really big logs...
 #          echo "ANSIBLE_VERBOSITY=2" >> $GITHUB_ENV
 
-      # Build "base"
-      - name: "Build devshop/container"
+      # Build "devshop.server"
+      - name: "Build devshop/server:${{ matrix.os }}"
         working-directory: docker
         run: docker-compose build
 
       # Launch Container
-      - name: "Launch a freshly built devshop/container:${{ matrix.os }} container"
+      - name: "Launch a freshly built devshop/server:${{ matrix.os }} container"
         working-directory: docker
-        # -f is used to skip loading docker-compose.override.yml
         run: |
-          docker-compose -f docker-compose.yml  up --detach
+          docker-compose up --detach devshop.server
           sleep 3
           docker-compose logs
-          docker-compose exec -T container devshop-logo "GitHub Actions Container populated with code. Running SHA ${GITHUB_PR_SHA}"s
+          docker-compose exec -T devshop.server /usr/share/devshop/scripts/devshop-logo "GitHub Actions Container populated with code. Running SHA ${GITHUB_PR_SHA}"
 
       - name: "Review Container Environment"
         working-directory: docker
         run: |
-          docker-compose exec -T container env
-          docker-compose exec -T container systemctl status --no-pager
+          docker-compose ps -a
+          docker ps -a
+          docker inspect docker_devshop.server_1
+          docker-compose exec -T devshop.server env
+          docker-compose exec -T devshop.server systemctl status --no-pager
           sleep 4
 
       - name: "Install DevShop (devshop.server/play.yml --tags=runtime)"
         working-directory: docker
 
         # Since the container is launched with a new DEVSHOP_DOCKER_COMMAND_RUN, run the default.
         run: |
-          docker-compose exec -T container devshop-ansible-playbook
+          docker-compose exec -T devshop.server bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}'
 
       - name: "Test DevShop"
         working-directory: docker
-        run: docker-compose exec -T --user aegir container /usr/share/devshop/tests/devshop-tests.sh
+        run: docker-compose exec -T --user aegir devshop.server /usr/share/devshop/tests/devshop-tests.sh
 
       - name: Save Docker Logs as Artifacts
         working-directory: docker

.github/workflows/install-sh-test.sh

@@ -33,7 +33,6 @@ docker run \
   --hostname $DEVSHOP_SERVER_HOSTNAME \
   --publish 80:80 \
   --volume $PWD/build/install.sh:/tmp/devshop-install.sh \
-  --volume /sys/fs/cgroup:/sys/fs/cgroup:ro \
   ubuntu/container
 
 docker exec \

.github/workflows/install.yml

@@ -47,6 +47,10 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
+    - name: Build Install Script
+      run: make build
+      working-directory: install
+
     - name: Run Install Script
       run: bash .github/workflows/install-sh-test.sh
 

RoboFile.php

@@ -59,7 +59,7 @@ class RoboFile extends \Robo\Tasks {
     'run-command' => 'DEVSHOP_DOCKER_COMMAND_RUN',
 
     // Used in docker compose image.
-    'from' => 'FROM_IMAGE',
+    'from' => 'DEVSHOP_CONTAINER_FROM',
     'os' => 'OS_VERSION',
     'dockerfile' => 'DOCKERFILE',
     'compose-file' => 'COMPOSE_FILE',
@@ -226,7 +226,8 @@ public function prepareSourcecode($opts = [
    * @param folder The folder to run 'docker-compose build' in. Use "all" to build in folder 'docker', then 'roles'.
    * @param service The service to build. passed to 'docker-compose build $SERVICE'. Use "all" to build all services.
    *
-   * @option $tag The string to tag the resulting container with.
+   * @option $docker-image The label to use when building or running the container.
+   * @option $scratch Set --scratch to set docker-image=ubuntu2004
    * @option $from The image to use to build the docker image FROM. Ignored if "os" is set.
    * @option $os An OS "slug" for any of the geerlingguy/docker-*-ansible images: https://hub.docker.com/u/geerlingguy/
    * @option $vars Ansible vars to pass to --extra-vars option.
@@ -238,7 +239,8 @@ public function prepareSourcecode($opts = [
    */
   public function build($folder = 'docker', $service = 'all', $opts = [
       'docker-image' => 'devshop/server:latest',
-      'from' => NULL,
+      'scratch' => FALSE,
+      'from' => 'ubuntu:18.04',
       'build-command' => NULL,
       'os' => NULL,
       'vars' => '',
@@ -249,6 +251,16 @@ public function build($folder = 'docker', $service = 'all', $opts = [
       'install-at-runtime' => FALSE,
   ]) {
 
+    try {
+      $branch = $this->getRepository()->getCurrentBranch();
+      $remote = $this->getRepository()->getCurrentRemoteName();
+      $remote_url = $this->getRepository()->getCurrentRemoteUrl();
+      $this->say("Current code branch <comment>{$branch}</comment> remote {$remote_url}");
+    } catch (\Exception $e) {
+      $this->io()->error("No upstream configured for branch '$branch'. Please set one with the command 'git branch --track $branch' or 'git push -u origin $branch'");
+      exit(1);
+    }
+
     if ($service == "all") {
       $service = '';
     }
@@ -260,7 +272,11 @@ public function build($folder = 'docker', $service = 'all', $opts = [
 
     // Define docker-image (name for the "image" in docker-compose)
     // Set FROM_IMAGE and DEVSHOP_DOCKER_IMAGE if --os option is used. (and --from was not used)
-    if (empty($opts['from']) && $opts['os'] !== NULL) {
+    if ($opts['scratch']) {
+      $opts['from'] = "ubuntu:18.04";
+    }
+
+    if ($opts['os'] !== NULL) {
       $opts['from'] = "geerlingguy/docker-{$opts['os']}-ansible";
       $opts['docker-image'] = 'devshop/server:' . $opts['os'];
     }
@@ -289,6 +305,11 @@ public function build($folder = 'docker', $service = 'all', $opts = [
     // Runtime Environment for the docker-compose build command.
     $env_build = $this->generateEnvironmentArgs($opts);
 
+    $env_build['ANSIBLE_EXTRA_VARS'] = "devshop_version={$branch} devshop_cli_version={$branch}";
+    $env_build['ANSIBLE_PLAYBOOK_COMMAND_OPTIONS_ARG'] = '--extra-vars=@/usr/share/devshop/vars.development.yml';
+
+    print_r($env_build);
+
     $provision_io = new \DevShop\Component\PowerProcess\PowerProcessStyle($this->input(), $this->output());
     $process = new \DevShop\Component\PowerProcess\PowerProcess("docker-compose build --no-cache $service", $provision_io);
     $process->setEnv($env_build);
@@ -387,7 +408,7 @@ public function up($docker_command = '/usr/share/devshop/scripts/devshop-ansible
     'docker-image' => 'devshop/server:latest',
     // The OS "slug" to use instead of devshop/server:ubuntu1804. If specified, "docker-image" option will be ignored.
     'os' => NULL,
-    'from' => NULL,
+    'from' => 'ubuntu:18.04',
     'vars' => '',
     'tags' => '',
     'skip-tags' => '',
@@ -472,7 +493,7 @@ public function up($docker_command = '/usr/share/devshop/scripts/devshop-ansible
       $opts['from'] = "geerlingguy/docker-{$opts['os']}-ansible";
       $opts['docker-image'] = 'devshop/server:' . $opts['os'];
     }
-    else {
+    elseif (empty($opts['from'])) {
       $opts['from'] = $opts['docker-image'];
     }
 
@@ -534,7 +555,7 @@ public function up($docker_command = '/usr/share/devshop/scripts/devshop-ansible
       $test_command = '';
       if ($opts['test']) {
         // Do not run a playbook on docker-compose up, because it will launch as a separate process and we won't know when it ends.
-        $cmd[] = "docker-compose run container {$docker_command}";
+        $cmd[] = "docker-compose run devshop.server {$docker_command}";
         $env_run['DEVSHOP_DOCKER_COMMAND_RUN'] = $docker_command;
 
         $test_command = "su aegir --command /usr/share/devshop/tests/devshop-tests.sh";
@@ -546,7 +567,7 @@ public function up($docker_command = '/usr/share/devshop/scripts/devshop-ansible
         $test_command = "/usr/share/devshop/tests/devshop-tests-upgrade.sh";
       }
       else {
-        $cmd[] = "docker-compose up --detach --force-recreate container";
+        $cmd[] = "docker compose up --detach --force-recreate devshop.server";
         if (!$opts['no-follow']) {
           $cmd[] = "docker-compose logs -f";
         }
@@ -557,6 +578,9 @@ public function up($docker_command = '/usr/share/devshop/scripts/devshop-ansible
 
       // Runtime Environment for the $cmd list.
       $env_run = $this->generateEnvironmentArgs($opts);
+      $env_run['ANSIBLE_PLAYBOOK_COMMAND_OPTIONS'] = '--extra-vars=@/usr/share/devshop/vars.development.yml';
+      print_r($env_run);
+
       $extra_vars = array();
 
       // Set devshop_version and cli_repo here because every local dev environment is different.
@@ -650,13 +674,15 @@ private function optionsToArray($options_list) {
   /**
    * Run a command in the devshop container.
    */
-  public function exec($cmd = '', $opts = ['user' => 'aegir']) {
-    return $this->_exec("docker-compose exec -T \
+  public function exec($cmd = '', $opts = ['user' => 'root']) {
+    return $this->taskExec("docker-compose exec -T \
       --env ANSIBLE_TAGS=runtime \
       --env ANSIBLE_SKIP_TAGS \
       --env ANSIBLE_VARS \
       --user {$opts['user']} \
-      devshop $cmd")->getExitCode();
+      devshop.server $cmd")
+        ->dir('docker')
+        ->run();
   }
 
   /**
@@ -681,13 +707,13 @@ public function destroy($opts = ['force' => 0]) {
       // Remove devmaster site folder
       $version = self::DEVSHOP_LOCAL_VERSION;
       $uri = self::DEVSHOP_LOCAL_URI;
-      $this->_exec("cd docker && docker-compose exec container rm -rf /usr/share/devshop/src/DevShop/Control/web/sites/{$uri}");
+      $this->_exec("cd docker && docker-compose exec devshop.server rm -rf /usr/share/devshop/src/DevShop/Control/web/sites/{$uri}");
       $this->_exec('cd docker && docker-compose kill');
       $this->_exec('cd docker && docker-compose rm -fv');
     }
 
     // Don't run when -n is specified,
-    if (!$this->input()->isInteractive() || $this->confirm("Destroy container home directory? (aegir-home)")) {
+    if (!$this->input()->isInteractive() || $this->confirm("Destroy devshop.server home directory? (aegir-home)")) {
       if ($this->_exec("rm -rf aegir-home")->wasSuccessful()) {
         $this->say("Entire aegir-home folder deleted.");
       }
@@ -732,7 +758,7 @@ public function logs() {
    */
   public function watchdog() {
     $user = 'aegir';
-    $this->taskExec("docker-compose exec --user $user -T container drush @hostmaster wd-show --tail --extended")
+    $this->taskExec("docker-compose exec --user $user -T devshop.server drush @hostmaster wd-show --tail --extended")
         ->dir("docker")
         ->run();
   }
@@ -754,10 +780,10 @@ public function restart() {
   public function shell($user = 'aegir') {
 
     if ($user) {
-        $process = new \Symfony\Component\Process\Process("docker-compose exec --user $user container bash");
+        $process = new \Symfony\Component\Process\Process("docker-compose exec --user $user devshop.server bash");
     }
     else {
-        $process = new \Symfony\Component\Process\Process("docker-compose exec container bash");
+        $process = new \Symfony\Component\Process\Process("docker-compose exec devshop.server bash");
     }
     $process->setTty(TRUE);
     $process->setTimeout(NULL);
@@ -779,16 +805,16 @@ public function test($user = 'aegir', $opts = array(
     // If running in CI, create the test-artifacts directory and ensure ownership first.
     // @TODO: Move logic to a special CI container.
     if (!empty($_SERVER['CI'])) {
-      $commands[] = "docker-compose exec $no_tty container mkdir -p /var/aegir/test-artifacts";
-      $commands[] = "docker-compose exec $no_tty container chown aegir:aegir /var/aegir/test-artifacts -R";
-      $commands[] = "docker-compose exec $no_tty container chmod 777 /var/aegir/test-artifacts -R";
+      $commands[] = "docker-compose exec $no_tty devshop.server mkdir -p /var/aegir/test-artifacts";
+      $commands[] = "docker-compose exec $no_tty devshop.server chown aegir:aegir /var/aegir/test-artifacts -R";
+      $commands[] = "docker-compose exec $no_tty devshop.server chmod 777 /var/aegir/test-artifacts -R";
     }
 
     if ($opts['reinstall']) {
-      $commands[] = "docker-compose exec $no_tty --user $user container drush @hostmaster provision-install --force-reinstall";
+      $commands[] = "docker-compose exec $no_tty --user $user devshop.server drush @hostmaster provision-install --force-reinstall";
     }
 
-    $commands[] = "docker-compose exec $no_tty --user $user container /usr/share/devshop/tests/devshop-tests.sh";
+    $commands[] = "docker-compose exec $no_tty --user $user devshop.server /usr/share/devshop/tests/devshop-tests.sh";
     $provision_io = new \DevShop\Component\PowerProcess\PowerProcessStyle($this->input, $this->output);
     foreach ($commands as $command) {
       $process = new \DevShop\Component\PowerProcess\PowerProcess($command, $provision_io);
@@ -815,7 +841,7 @@ public function test($user = 'aegir', $opts = array(
    * Get a one-time login link to Devamster.
    */
   public function login($user = 'aegir') {
-    $this->taskExec("docker-compose exec --user $user -T container /usr/share/devshop/bin/drush @hostmaster uli")
+    $this->taskExec("docker-compose exec --user $user -T devshop.server /usr/share/devshop/bin/drush @hostmaster uli")
         ->dir("docker")
         ->run();
     ;

composer.json

@@ -27,7 +27,8 @@
         "drupal/provision": "4.x-dev",
         "psr/cache": "^1.0",
         "symfony/deprecation-contracts": "^2.5",
-        "symfony/options-resolver": "^4.4"
+        "symfony/options-resolver": "^4.4",
+        "devshop/bin-tools": "1.x-dev"
     },
     "replace": {
         "drupal/drupal": "*"
@@ -45,6 +46,10 @@
             "type": "composer",
             "url": "https://packages.drupal.org/7"
         },
+        {
+            "type": "path",
+            "url": "scripts"
+        },
         {
             "type": "path",
             "url": "src/DevShop/Component/ComposerCommon"
@@ -117,9 +122,6 @@
         "post-install-cmd": [
             "DevShop\\Composer::installControl"
         ],
-        "post-update-cmd": [
-            "DevShop\\Composer::updateControl"
-        ],
         "roles:update": [
             "DevShop\\Composer::updateRoles"
         ]