Merge pull request #177 from palantirnet/circleci-convenience-image-u…

…pdate Use new CircleCI convenience image for PHP
palantirnet · Mar 11, 2022 · 463a3f1 · 463a3f1
2 parents d917e82 + 67814e0
commit 463a3f1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 32 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,13 +1,13 @@
 # This CircleCI configuration is for testing the-build itself. For the configuration
 # installed in projects, see defaults/install/.circleci/config.yml
 
-version: 2
+version: 2.1
 jobs:
   build:
     working_directory: ~/example
     docker:
-      - image: circleci/php:7.4-node-browsers
-      - image: circleci/mysql:5.7-ram
+      - image: cimg/php:7.4-browsers
+      - image: cimg/mysql:5.7
         command: --max_allowed_packet=16M
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
@@ -22,16 +22,11 @@ jobs:
       - run:
           name: Install packages
           command: |
-            sudo apt-get update
-            sudo apt-get install -y libpng-dev default-mysql-client
-      - run:
-          name: Install PHP extensions
-          command: sudo docker-php-ext-install pdo_mysql gd
+            sudo apt-get update && sudo apt-get install -y libpng-dev default-mysql-client
       - run:
           name: Configure PHP
           command: |
-            echo "sendmail_path=/bin/true" | sudo tee -a "/usr/local/etc/php/php.ini"
-            echo "memory_limit=-1" | sudo tee -a "/usr/local/etc/php/php.ini"
+            echo "sendmail_path=/bin/true" | sudo tee -a "/etc/php.d/circleci.ini"
       - run:
           name: Create artifacts directory
           command: mkdir /tmp/artifacts

diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml
@@ -1,10 +1,16 @@
-version: 2
+version: 2.1
+# To use browsers on CircleCI, uncomment the lines below and add steps to install them.
+# For example, add these to `jobs.build.steps`:
+# - browser-tools/install-chrome
+# - browser-tools/install-chromedriver
+# orbs:
+#   browser-tools: circleci/[email protected]
 jobs:
   build:
     working_directory: ~/${projectname}
     docker:
-      - image: circleci/php:7.3-node-browsers
-      - image: circleci/mysql:5.7-ram
+      - image: cimg/php:7.4-node-browsers
+      - image: cimg/mysql:5.7
         command: --max_allowed_packet=16M
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
@@ -20,8 +26,7 @@ jobs:
       - run:
           name: Install packages
           command: |
-            sudo apt-get update
-            sudo apt-get install -y libpng-dev default-mysql-client
+            sudo apt-get update && sudo apt-get install -y libpng-dev default-mysql-client
       - run:
           name: Install nvm
           command: |
@@ -30,14 +35,10 @@ jobs:
             touch $BASH_ENV
             echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
             echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-      - run:
-          name: Install PHP extensions
-          command: sudo docker-php-ext-install pdo_mysql gd
       - run:
           name: Configure PHP
           command: |
-            echo "sendmail_path=/bin/true" | sudo tee -a "/usr/local/etc/php/php.ini"
-            echo "memory_limit=-1" | sudo tee -a "/usr/local/etc/php/php.ini"
+            echo "sendmail_path=/bin/true" | sudo tee -a "/etc/php.d/circleci.ini"
       - run:
           name: Create artifacts directory
           command: mkdir /tmp/artifacts

diff --git a/defaults/install/.circleci/deploy-acquia-example b/defaults/install/.circleci/deploy-acquia-example
@@ -21,7 +21,7 @@
   deploy:
     working_directory: ~/project
     docker:
-      - image: circleci/php:7.2-node-browsers
+      - image: cimg/php:7.4-browsers
     environment:
       - NODE_VERSION: 8
       - GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
@@ -33,7 +33,7 @@
       - add_ssh_keys
       - run:
           name: Install packages
-          command: sudo apt-get install -y libpng-dev
+          command: sudo apt-get update && sudo apt-get install -y libpng-dev
 
       - run:
           name: Install nvm
@@ -43,13 +43,10 @@
             touch $BASH_ENV
             echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
             echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-      - run:
-          name: Install PHP extensions
-          command: sudo docker-php-ext-install gd
       - run:
           name: Configure PHP
           command: |
-            echo "memory_limit=-1" | sudo tee -a "/usr/local/etc/php/php.ini"
+            echo "sendmail_path=/bin/true" | sudo tee -a "/etc/php.d/circleci.ini"
       - run:
           name: Configure Git
           command: |

diff --git a/defaults/install/.circleci/deploy-pantheon.example b/defaults/install/.circleci/deploy-pantheon.example
@@ -23,7 +23,7 @@
   deploy:
     working_directory: ~/project
     docker:
-      - image: circleci/php:7.2-node-browsers
+      - image: cimg/php:7.4-browsers
     environment:
       - NODE_VERSION: 8
       - GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
@@ -35,7 +35,7 @@
       - add_ssh_keys
       - run:
           name: Install packages
-          command: sudo apt-get install -y libpng-dev
+          command: sudo apt-get update && sudo apt-get install -y libpng-dev
 
       - run:
           name: Install nvm
@@ -45,13 +45,10 @@
             touch $BASH_ENV
             echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
             echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-      - run:
-          name: Install PHP extensions
-          command: sudo docker-php-ext-install gd
       - run:
           name: Configure PHP
           command: |
-            echo "memory_limit=-1" | sudo tee -a "/usr/local/etc/php/php.ini"
+            echo "sendmail_path=/bin/true" | sudo tee -a "/etc/php.d/circleci.ini"
       - run:
           name: Configure Git
           command: |