diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8f39408d..d2572664 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,47 +1,66 @@ version: 2 updates: + + # silta-cicd - package-ecosystem: "docker" - directory: "/silta-node/12-alpine" + directory: "/silta-cicd/circleci-php8.0-node16-composer2" schedule: interval: "daily" ignore: - - dependency-name: "*" - update-types: ["version-update:semver-major"] + - dependency-name: "cimg/php" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" - package-ecosystem: "docker" - directory: "/silta-node/14-alpine" + directory: "/silta-cicd/circleci-php8.1-node16-composer2" schedule: interval: "daily" ignore: - - dependency-name: "*" - update-types: ["version-update:semver-major"] + - dependency-name: "cimg/php" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" - package-ecosystem: "docker" - directory: "/silta-node/16-alpine" + directory: "/silta-cicd/circleci-php8.1-node18-composer2" schedule: interval: "daily" ignore: - - dependency-name: "*" - update-types: ["version-update:semver-major"] + - dependency-name: "cimg/php" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" - package-ecosystem: "docker" - directory: "/silta-node/18-alpine" + directory: "/silta-cicd/circleci-php8.2-node18-composer2" schedule: interval: "daily" ignore: - - dependency-name: "*" - update-types: ["version-update:semver-major"] + - dependency-name: "cimg/php" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" - package-ecosystem: "docker" - directory: "/silta-node/20-alpine" + directory: "/silta-cicd/circleci-php8.2-node20-composer2" schedule: interval: "daily" ignore: - - dependency-name: "*" - update-types: ["version-update:semver-major"] + - dependency-name: "cimg/php" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" + # silta-mailhog + - package-ecosystem: "docker" + directory: "/silta-mailhog/silent" + schedule: + interval: "daily" + + # silta-nginx - package-ecosystem: "docker" directory: "/silta-nginx/1.17" schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "nginx" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -50,7 +69,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "nginx" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -59,7 +78,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "nginx" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -68,7 +87,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "nginx" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -77,7 +96,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "nginx" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -86,17 +105,55 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "nginx" update-types: - "version-update:semver-major" - "version-update:semver-minor" + # silta-node + - package-ecosystem: "docker" + directory: "/silta-node/12-alpine" + schedule: + interval: "daily" + ignore: + - dependency-name: "node" + update-types: ["version-update:semver-major"] + - package-ecosystem: "docker" + directory: "/silta-node/14-alpine" + schedule: + interval: "daily" + ignore: + - dependency-name: "node" + update-types: ["version-update:semver-major"] + - package-ecosystem: "docker" + directory: "/silta-node/16-alpine" + schedule: + interval: "daily" + ignore: + - dependency-name: "node" + update-types: ["version-update:semver-major"] + - package-ecosystem: "docker" + directory: "/silta-node/18-alpine" + schedule: + interval: "daily" + ignore: + - dependency-name: "node" + update-types: ["version-update:semver-major"] + - package-ecosystem: "docker" + directory: "/silta-node/20-alpine" + schedule: + interval: "daily" + ignore: + - dependency-name: "node" + update-types: ["version-update:semver-major"] + + # silta-php-fpm - package-ecosystem: "docker" directory: "/silta-php-fpm/7.2-fpm" schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "php" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -105,7 +162,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "php" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -114,7 +171,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "php" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -123,7 +180,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "php" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -132,7 +189,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "php" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -141,17 +198,18 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "php" update-types: - "version-update:semver-major" - "version-update:semver-minor" + # silta-php-shell - package-ecosystem: "docker" directory: "/silta-php-shell/php-7.2" schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "wunderio/silta-php-fpm" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -160,7 +218,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "wunderio/silta-php-fpm" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -169,7 +227,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "wunderio/silta-php-fpm" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -178,7 +236,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "wunderio/silta-php-fpm" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -187,7 +245,7 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "wunderio/silta-php-fpm" update-types: - "version-update:semver-major" - "version-update:semver-minor" @@ -196,48 +254,59 @@ updates: schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "wunderio/silta-php-fpm" update-types: - "version-update:semver-major" - "version-update:semver-minor" + # silta-proxy - package-ecosystem: "docker" - directory: "/silta-varnish/varnish6" + directory: "/silta-proxy/latest" schedule: interval: "daily" - ignore: - - dependency-name: "*" - update-types: ["version-update:semver-major"] + # silta-robot-framework - package-ecosystem: "docker" - directory: "/silta-mailhog/silent" + directory: "/silta-robot-framework/robot-6" schedule: interval: "daily" + # silta-rsync - package-ecosystem: "docker" - directory: "/silta-proxy/latest" + directory: "/silta-rsync/rsync" schedule: interval: "daily" + # silta-solr - package-ecosystem: "docker" - directory: "/silta-rsync/rsync" + directory: "/silta-solr/8" schedule: interval: "daily" + ignore: + - dependency-name: "geerlingguy/solr" + update-types: ["version-update:semver-major"] + # silta-splash - package-ecosystem: "docker" - directory: "/silta-solr/8" + directory: "/silta-splash/latest" schedule: interval: "daily" ignore: - - dependency-name: "*" + - dependency-name: "nginxinc/nginx-unprivileged" update-types: ["version-update:semver-major"] + # silta-varnish - package-ecosystem: "docker" - directory: "/silta-splash/latest" + directory: "/silta-varnish/varnish6" schedule: interval: "daily" ignore: - - dependency-name: "*" - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" + - dependency-name: "varnish" + update-types: ["version-update:semver-major"] + - package-ecosystem: "docker" + directory: "/silta-varnish/varnish7" + schedule: + interval: "daily" + ignore: + - dependency-name: "varnish" + update-types: ["version-update:semver-major"] diff --git a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile index 0fc05511..9adee427 100644 --- a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile +++ b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/php:8.0.13-node +FROM cimg/php:8.0.13 # Make composer packages executable. ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}" @@ -56,5 +56,22 @@ RUN sudo apt-get clean autoclean -y \ # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged, # switch back to using https://github.com/lrills/helm-unittest as the source +# Install Node.js and Yarn. +# The following code is based on the CircleCI Node.js Dockerfile template: +# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template +ENV NODE_VERSION 16.13.0 +RUN echo "Installing Node.js version ${NODE_VERSION}" +RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \ + sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \ + rm node.tar.xz && \ + sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.22.5 +RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \ + sudo tar -xzf yarn.tar.gz -C /opt/ && \ + rm yarn.tar.gz && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg + # Add custom php config and lift memory limit. COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini diff --git a/silta-cicd/circleci-php8.0-node16-composer2/README.md b/silta-cicd/circleci-php8.0-node16-composer2/README.md index a657adf3..006c5107 100644 --- a/silta-cicd/circleci-php8.0-node16-composer2/README.md +++ b/silta-cicd/circleci-php8.0-node16-composer2/README.md @@ -1,13 +1,16 @@ # silta-circleci -A docker image used circleCI, based on `cimg/php:8.0.13-node` with the following additions: +A docker image used circleCI, based on `cimg/php:8.0.13` with the following additions: - Composer configured correctly - Drush-launcher and coder pre-installed - Vim, useful for debugging - kubernetes and helm +- Node.js +- Yarn ## Versions - PHP: 8.0.13 - Composer: 2.1.12 - Node: 16.13.0 +- Yarn: 1.22.5 - Helm: v3.14.0 diff --git a/silta-cicd/circleci-php8.0-node16-composer2/TAGS b/silta-cicd/circleci-php8.0-node16-composer2/TAGS index 0db1474b..23089edf 100644 --- a/silta-cicd/circleci-php8.0-node16-composer2/TAGS +++ b/silta-cicd/circleci-php8.0-node16-composer2/TAGS @@ -1,3 +1,3 @@ circleci-php8.0-node16-composer2-v1 -circleci-php8.0-node16-composer2-v1.4 -circleci-php8.0-node16-composer2-v1.4.0 +circleci-php8.0-node16-composer2-v1.5 +circleci-php8.0-node16-composer2-v1.5.0 diff --git a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile index 319b5613..22890961 100644 --- a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile +++ b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/php:8.1.7-node +FROM cimg/php:8.1.7 # Make composer packages executable. ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}" @@ -52,5 +52,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \ # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged, # switch back to using https://github.com/lrills/helm-unittest as the source +# Install Node.js and Yarn. +# The following code is based on the CircleCI Node.js Dockerfile template: +# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template +ENV NODE_VERSION 16.15.1 +RUN echo "Installing Node.js version ${NODE_VERSION}" +RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \ + sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \ + rm node.tar.xz && \ + sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.22.5 +RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \ + sudo tar -xzf yarn.tar.gz -C /opt/ && \ + rm yarn.tar.gz && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg + # Add custom php config and lift memory limit. COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini diff --git a/silta-cicd/circleci-php8.1-node16-composer2/README.md b/silta-cicd/circleci-php8.1-node16-composer2/README.md index 81939b00..539392e6 100644 --- a/silta-cicd/circleci-php8.1-node16-composer2/README.md +++ b/silta-cicd/circleci-php8.1-node16-composer2/README.md @@ -1,13 +1,16 @@ # silta-circleci -A docker image used circleCI, based on `cimg/php:8.1.7-node` with the following additions: +A docker image used circleCI, based on `cimg/php:8.1.7` with the following additions: - Composer configured correctly - Drush-launcher and coder pre-installed - Vim, useful for debugging - kubernetes and helm +- Node.js +- Yarn ## Versions - PHP: 8.1.7 - Composer: 2.1.12 - Node: 16.15.1 +- Yarn: 1.22.5 - Helm: v3.14.0 diff --git a/silta-cicd/circleci-php8.1-node16-composer2/TAGS b/silta-cicd/circleci-php8.1-node16-composer2/TAGS index 2eb7ccd5..33f5dfa5 100644 --- a/silta-cicd/circleci-php8.1-node16-composer2/TAGS +++ b/silta-cicd/circleci-php8.1-node16-composer2/TAGS @@ -1,3 +1,3 @@ circleci-php8.1-node16-composer2-v1 -circleci-php8.1-node16-composer2-v1.3 -circleci-php8.1-node16-composer2-v1.3.0 +circleci-php8.1-node16-composer2-v1.4 +circleci-php8.1-node16-composer2-v1.4.0 diff --git a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile index b3dd7859..da107264 100644 --- a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile +++ b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/php:8.1.23-node +FROM cimg/php:8.1.23 # Make composer packages executable. ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}" @@ -51,5 +51,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \ # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged, # switch back to using https://github.com/lrills/helm-unittest as the source +# Install Node.js and Yarn. +# The following code is based on the CircleCI Node.js Dockerfile template: +# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template +ENV NODE_VERSION 18.17.1 +RUN echo "Installing Node.js version ${NODE_VERSION}" +RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \ + sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \ + rm node.tar.xz && \ + sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.22.19 +RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \ + sudo tar -xzf yarn.tar.gz -C /opt/ && \ + rm yarn.tar.gz && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg + # Add custom php config and lift memory limit. COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini diff --git a/silta-cicd/circleci-php8.1-node18-composer2/README.md b/silta-cicd/circleci-php8.1-node18-composer2/README.md index 10a16261..168dca03 100644 --- a/silta-cicd/circleci-php8.1-node18-composer2/README.md +++ b/silta-cicd/circleci-php8.1-node18-composer2/README.md @@ -1,13 +1,16 @@ # silta-circleci -A docker image used circleCI, based on `cimg/php:8.1.23-node` with the following additions: +A docker image used circleCI, based on `cimg/php:8.1.23` with the following additions: - Composer configured correctly - Drush-launcher and coder pre-installed - Vim, useful for debugging - kubernetes and helm +- Node.js +- Yarn ## Versions - PHP: 8.1.23 - Composer: 2.5.1 - Node: 18.17.1 +- Yarn: 1.22.19 - Helm: v3.14.0 diff --git a/silta-cicd/circleci-php8.1-node18-composer2/TAGS b/silta-cicd/circleci-php8.1-node18-composer2/TAGS index c4910aea..89da7909 100644 --- a/silta-cicd/circleci-php8.1-node18-composer2/TAGS +++ b/silta-cicd/circleci-php8.1-node18-composer2/TAGS @@ -1,3 +1,3 @@ circleci-php8.1-node18-composer2-v1 -circleci-php8.1-node18-composer2-v1.3 -circleci-php8.1-node18-composer2-v1.3.0 +circleci-php8.1-node18-composer2-v1.4 +circleci-php8.1-node18-composer2-v1.4.0 diff --git a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile index 298d53c5..aa588be1 100644 --- a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile +++ b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/php:8.2.12-node +FROM cimg/php:8.2.12 # Make composer packages executable. ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}" @@ -51,5 +51,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \ # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged, # switch back to using https://github.com/lrills/helm-unittest as the source +# Install Node.js and Yarn. +# The following code is based on the CircleCI Node.js Dockerfile template: +# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template +ENV NODE_VERSION 18.18.2 +RUN echo "Installing Node.js version ${NODE_VERSION}" +RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \ + sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \ + rm node.tar.xz && \ + sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.22.19 +RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \ + sudo tar -xzf yarn.tar.gz -C /opt/ && \ + rm yarn.tar.gz && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg + # Add custom php config and lift memory limit. COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini diff --git a/silta-cicd/circleci-php8.2-node18-composer2/README.md b/silta-cicd/circleci-php8.2-node18-composer2/README.md index b2ca8164..f4967144 100644 --- a/silta-cicd/circleci-php8.2-node18-composer2/README.md +++ b/silta-cicd/circleci-php8.2-node18-composer2/README.md @@ -1,13 +1,16 @@ # silta-circleci -A docker image used circleCI, based on `cimg/php:8.1.7-node` with the following additions: +A docker image used circleCI, based on `cimg/php:8.2.12` with the following additions: - Composer configured correctly - Drush-launcher and coder pre-installed - Vim, useful for debugging - kubernetes and helm +- Node.js +- Yarn ## Versions - PHP: 8.2.0 - Composer: 2.1.12 -- Node: 18.12.1 +- Node: 18.18.2 +- Yarn: 1.22.19 - Helm: v3.14.0 diff --git a/silta-cicd/circleci-php8.2-node18-composer2/TAGS b/silta-cicd/circleci-php8.2-node18-composer2/TAGS index 06a21432..fa604272 100644 --- a/silta-cicd/circleci-php8.2-node18-composer2/TAGS +++ b/silta-cicd/circleci-php8.2-node18-composer2/TAGS @@ -1,3 +1,3 @@ circleci-php8.2-node18-composer2-v1 -circleci-php8.2-node18-composer2-v1.3 -circleci-php8.2-node18-composer2-v1.3.0 +circleci-php8.2-node18-composer2-v1.4 +circleci-php8.2-node18-composer2-v1.4.0 diff --git a/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile index 4baf76cb..41b042c5 100644 --- a/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile +++ b/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/php:8.2.13-node +FROM cimg/php:8.2.13 # Make composer packages executable. ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}" @@ -51,5 +51,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \ # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged, # switch back to using https://github.com/lrills/helm-unittest as the source +# Install Node.js and Yarn. +# The following code is based on the CircleCI Node.js Dockerfile template: +# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template +ENV NODE_VERSION 20.9.0 +RUN echo "Installing Node.js version ${NODE_VERSION}" +RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \ + sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \ + rm node.tar.xz && \ + sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.22.19 +RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \ + sudo tar -xzf yarn.tar.gz -C /opt/ && \ + rm yarn.tar.gz && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \ + sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg + # Add custom php config and lift memory limit. COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini diff --git a/silta-cicd/circleci-php8.2-node20-composer2/README.md b/silta-cicd/circleci-php8.2-node20-composer2/README.md index ff0307b7..a1f2ad47 100644 --- a/silta-cicd/circleci-php8.2-node20-composer2/README.md +++ b/silta-cicd/circleci-php8.2-node20-composer2/README.md @@ -1,13 +1,16 @@ # silta-circleci -A docker image used circleCI, based on `cimg/php:8.2.13-node` with the following additions: +A docker image used circleCI, based on `cimg/php:8.2.13` with the following additions: - Composer configured correctly - Drush-launcher and coder pre-installed - Vim, useful for debugging - kubernetes and helm +- Node.js +- Yarn ## Versions - PHP: 8.2.13 - Composer: 2.5.1 - Node: 20.9.0 +- Yarn: 1.22.19 - Helm: v3.14.0 diff --git a/silta-cicd/circleci-php8.2-node20-composer2/TAGS b/silta-cicd/circleci-php8.2-node20-composer2/TAGS index 5faebc6e..b99b6b88 100644 --- a/silta-cicd/circleci-php8.2-node20-composer2/TAGS +++ b/silta-cicd/circleci-php8.2-node20-composer2/TAGS @@ -1,3 +1,3 @@ circleci-php8.2-node20-composer2-v1 -circleci-php8.2-node20-composer2-v1.2 -circleci-php8.2-node20-composer2-v1.2.0 +circleci-php8.2-node20-composer2-v1.3 +circleci-php8.2-node20-composer2-v1.3.0