Skip to content

Commit

Permalink
Merge pull request #176 from stellarwp/1.5.2
Browse files Browse the repository at this point in the history
Update npm, nvm versions
  • Loading branch information
lucatume authored Jan 8, 2024
2 parents 2cc8263 + b9862e8 commit eb40b37
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-slic-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,5 @@ jobs:
cache-to: type=gha,mode=max,scope=${{ matrix.php_version }}
build-args: |
PHP_VERSION=${{ matrix.php_version }}
NODE_VERSION=16.6.1
NVM_VERSION=v0.39.3
NODE_VERSION=18.13.0
NVM_VERSION=v0.39.7
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

# [1.5.1] - 2024-01-05
* Change - Update the `npm` version to `18.13.0`
* Change - Update the `nvm` version to `v0.39.7`
* Fixed - Ensure `nvm` cache directory is world-accessible to allow use of `nvm install`

# [1.5.1] - 2023-11-20
* Change - Allow controlling the value of the `WP_HTTP_BLOCK_EXTERNAL` constant using the `SLIC_WP_HTTP_BLOCK_EXTERNAL` environment variable defined in the `.env.slic.run` configuration file; set to `true` by default to block all outgoing HTTP requests from WordPress.
* Change - Allow controlling the value of the `DISABLE_WP_CRON` constant using the `SLIC_DISABLE_WP_CRON` environment variable defined in the `.env.slic.run` configuration file; set to `true` by default to disable the WordPress cron system.
Expand Down
14 changes: 9 additions & 5 deletions containers/slic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ FROM composer:2 AS composer2

FROM php:${PHP_VERSION}

ARG NODE_VERSION=16.6.1
ARG NVM_VERSION=v0.39.3
ARG NODE_VERSION=18.13.0
ARG NVM_VERSION=v0.39.7
# Disable AVIF for GD https://github.com/mlocati/docker-php-extension-installer#configuration
ARG IPE_GD_WITHOUTAVIF=true

Expand All @@ -28,9 +28,13 @@ RUN if [ ${IPE_GD_WITHOUTAVIF} = true ]; then \
install-php-extensions gd; \
fi

# Install some more packages required by wp-cli and Composer.
# Install some more packages required by wp-cli, Composer and Playwright.
RUN apt-get update && apt-get upgrade -yqq && apt-get install -yqq --no-install-recommends --show-progress \
default-mysql-client curl git zip unzip iproute2 \
libnss3 libnspr4 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 \
libcups2 libdrm2 libxkbcommon0 libatspi2.0-0 libxcomposite1 \
libxdamage1 libxext6 libxfixes3 libxrandr2 libgbm1 \
libpango-1.0-0 libcairo2 libasound2 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

# Configure the uopz extension.
Expand All @@ -53,14 +57,14 @@ RUN xdebug-off
ENV NODE_VERSION=${NODE_VERSION}
ENV NVM_VERSION=${NVM_VERSION}
ENV NVM_DIR=/usr/local/bin/.nvm
RUN mkdir /usr/local/bin/.nvm
RUN mkdir /usr/local/bin/.nvm && mkdir /usr/local/bin/.nvm/cache
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash
RUN bash -c '. $NVM_DIR/nvm.sh && nvm install $NODE_VERSION'
RUN bash -c '. $NVM_DIR/nvm.sh && nvm alias default $NODE_VERSION'
RUN bash -c '. $NVM_DIR/nvm.sh && nvm use default'

ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$NVM_DIR:$PATH
RUN chmod a+x $NVM_DIR/nvm.sh
RUN chmod a+x $NVM_DIR/nvm.sh && chmod a+rwx $NVM_DIR/cache

# Install Composer 1 and 2 from the respective images and make them world-executable.
COPY --from=composer1 /usr/bin/composer /usr/local/bin/composer1
Expand Down
2 changes: 1 addition & 1 deletion slic.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
] );

$cli_name = 'slic';
const CLI_VERSION = '1.5.1';
const CLI_VERSION = '1.5.2';

// If the run-time option `-q`, for "quiet", is specified, then do not print the header.
if ( in_array( '-q', $argv, true ) || ( in_array( 'exec', $argv, true ) && ! in_array( 'help', $argv, true ) ) ) {
Expand Down

0 comments on commit eb40b37

Please sign in to comment.