Skip to content

Commit d15e126

Browse files
committed
change CircleCI image for edge build
1 parent 59efe5a commit d15e126

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

.circleci/config.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ default_docker_image: &docker_image
1414
PHP_INI_MAX_INPUT_TIME: 60
1515
custom_npm_docker_image: &custom_npm_docker_image
1616
docker:
17-
- image: circleci/php:8.1-apache-browsers
17+
- image: thecodingmachine/php:8.1-v4-apache-node14
1818
environment:
1919
PLATFORM_REGION: "uk-1.platform.sh"
20-
PROJECT_ROOT: "/home/circleci/project"
20+
PROJECT_ROOT: "/home/docker/project"
21+
PHP_EXTENSIONS: "gd"
2122
# git variables to avoid empty committer identity errors
2223
EMAIL: "circleci@localhost"
2324
GIT_COMMITTER_NAME: "Circle CI"
@@ -67,6 +68,7 @@ commands:
6768
- run:
6869
name: Switch dof-dss packages to HEAD on development branch
6970
command: |
71+
cd project
7072
composer require dof-dss/nicsdru_unity_theme:dev-development \
7173
dof-dss/nicsdru_origins_modules:dev-development \
7274
dof-dss/nicsdru_unity_modules:dev-development
@@ -147,11 +149,9 @@ jobs:
147149
- run:
148150
name: Add OS and PHP extensions
149151
command: |
150-
sudo cp $PROJECT_ROOT/.circleci/docker-php-circleci.ini /usr/local/etc/php/conf.d/
151152
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
152153
sudo apt update --allow-releaseinfo-change
153154
sudo apt install -y libpng-dev
154-
sudo docker-php-ext-install gd pcntl posix
155155
- install_psh_cli
156156
- run:
157157
name: Switch to edge branch
@@ -167,16 +167,17 @@ jobs:
167167
command: |
168168
# Need to re-build site theme with any Unity changes.
169169
# Download and configure node and npm.
170-
sudo apt install libjpeg-dev automake python -y
170+
sudo apt install libjpeg-dev make python g++ -y
171171
git clone https://github.com/nvm-sh/nvm.git
172172
cd nvm
173173
chmod +x install.sh
174174
./install.sh
175175
- run:
176176
name: Rebuild site themes
177177
command: |
178-
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
179-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
178+
export NVM_DIR="$HOME/.nvm"
179+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
180+
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
180181
nvm install v15.14.0
181182
for site in `ls -l ~/project/project/sites | grep ^d | awk '{print $9}'`
182183
do

0 commit comments

Comments
 (0)