Removes using containers for the node packages (#701)

* Removes using containers for the node packages

* Upgrade Docker in CircleCI

* Revert previous commit

* Ensure the docker file actually runs

* Set the right env variable by default

* install yarn

* fix syntax

* install more recent node version

* Try to use nvm before make

* shrug

* Fix test commands for node

* try to always use the right node version

* let's try

* remove invalid command

* try to install nvm

* Maybe update node

* Add missing line

* .

* .

* Remove unused script

Author: justafish

.circleci/config.yml

@@ -4,31 +4,36 @@ aliases:
   - &yarn-cache
     v4-yarn-cache
 
-  - &composer-cache
-    v4-composer-cache
-
 commands:
-
-  start-project:
+  setup-project:
     steps:
       - checkout
       - restore_cache:
           keys:
             - *yarn-cache
-      - restore_cache:
-          keys:
-            - *composer-cache
+      - run:
+          name: Install Node 10 and Yarn
+          command: |
+            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
+            export NVM_DIR="/opt/circleci/.nvm"
+            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+            nvm install v10
+            nvm alias default v10
+            curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+            echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+            sudo apt-get update && sudo apt-get install yarn
+            echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+            echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
       - run:
           name: Start Docker
           command: |
             set -x
-            uid=$(id -u) gid=$(id -g) docker-compose build
+            make build
             docker-compose up -d
-            ./.docker/check-ready.sh
-      - save_cache:
-          key: *composer-cache
-          paths:
-            - ~/.composer/cache
+            sleep 15
+      - run:
+          name: Install Projects
+          command: make install
       - save_cache:
           key: *yarn-cache
           paths:
@@ -82,13 +87,13 @@ jobs:
   test_node:
     machine: true
     steps:
-      - start-project
+      - setup-project
       - run:
           name: Run tests
           command: |
             docker exec -it drupal_admin_ui_drupal drush user:password admin admin
-            docker exec -it -e REACT_APP_DRUPAL_BASE_URL=http://drupal drupal_admin_ui_node yarn workspace admin-ui build
-            docker exec -it -e REACT_APP_DRUPAL_BASE_URL=http://drupal -e NIGHTWATCH_LOGIN_admin_PASSWORD=admin drupal_admin_ui_node yarn test
+            yarn build
+            REACT_APP_DRUPAL_BASE_URL=http://drupal NIGHTWATCH_LOGIN_admin_PASSWORD=admin yarn test
       - store_test_results:
           path: ~/project/packages/admin-ui/reports
       - store_artifacts:
@@ -97,7 +102,7 @@ jobs:
   test_drupal:
     machine: true
     steps:
-      - start-project
+      - setup-project
       - run:
           name: Run tests
           command: docker exec -it drupal_admin_ui_drupal composer test
@@ -107,7 +112,7 @@ jobs:
   dist:
     machine: true
     steps:
-      - start-project
+      - setup-project
 
       # This pushes to https://github.com/jsdrupal/drupal-admin-ui-dist
       # which is then distributed to https://packagist.org/packages/justafish/drupal-admin-ui

.docker/check-ready.sh

@@ -0,0 +1,43 @@
+FROM alpine:3.8 AS dependencies
+
+ARG HOST_UID
+ARG HOST_GID
+
+ADD .docker/scripts/createUser.sh /root/createUser.sh
+
+RUN apk add shadow sudo supervisor make \
+        php sqlite composer git \
+        php7-pdo php7-gd php7-openssl php7-json php7-mbstring php7-dom php7-session php7-xml php7-simplexml \
+        php7-tokenizer php7-curl php7-xmlwriter php7-ctype php7-opcache php7-pdo_mysql mysql-client php7-fpm \
+        php7-xdebug && \
+    sed -i 's/^CREATE_MAIL_SPOOL=yes/CREATE_MAIL_SPOOL=no/' /etc/default/useradd && \
+    sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers && \
+    sed -i 's/\[supervisord\]/\[supervisord\]\nuser=root    ;/' /etc/supervisord.conf && \
+    sed -i 's/;opcache.enable=1/opcache.enable=1/' /etc/php7/php.ini && \
+    sed -i 's/user = nobody/user = nginx/' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/group = nobody/group = nginx/' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/listen = 127.0.0.1:9000/listen = \/var\/run\/nginx\/php-fpm7.sock/' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/;listen.allowed_clients = 127.0.0.1/listen.allowed_clients = 127.0.0.1/' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/;listen.owner = nobody/listen.owner = nginx/' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/;listen.group = nginx/listen.group = nginx/' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/;listen.mode = 0660/listen.mode = 0660/' /etc/php7/php-fpm.d/www.conf && \
+    NAME="nginx" HOST_UID=$HOST_UID HOST_GID=$HOST_GID /bin/sh /root/createUser.sh && rm /root/createUser.sh && \
+    apk add nginx && \
+    mkdir -p /run/nginx && \
+    mkdir -p /var/www/.composer && \
+    mkdir -p /var/www/.cache && \
+    touch /var/www/.drupal-container && \
+    chown -R nginx:nginx /var/www
+
+ADD .docker/images/drupal/nginx-default.conf /etc/nginx/conf.d/default.conf
+ADD .docker/images/drupal/supervisord.conf /etc/supervisor.d/default.ini
+
+FROM dependencies AS install
+USER nginx
+WORKDIR /var/www/drupal
+ENV PATH="/var/www/drupal/vendor/bin:${PATH}"
+RUN composer global require hirak/prestissimo
+
+FROM install AS start
+EXPOSE 80
+ENTRYPOINT ["sudo", "supervisord", "-c", "/etc/supervisord.conf"]

.docker/drupal/Dockerfile

@@ -30,3 +30,8 @@ then
   groupmod -g ${NEW_GID} ${GROUPNAME}
   find / -group ${HOST_GID} -exec chgrp -h ${GROUPNAME} {} \;
 fi
+
+# Adds a user and a corresponding group, and adds the user to sudoers.
+groupadd -g ${HOST_GID} ${NAME}
+useradd -u ${HOST_UID} -d /var/www -g ${HOST_GID} ${NAME}
+usermod -a -G wheel ${NAME}

.docker/images/drupal/Dockerfile

@@ -0,0 +1,3 @@
+# Docker
+HOST_UID=
+HOST_GID=