Skip to content

Commit 26b369f

Browse files
authored
Merge branch 'master' into chore(cleanup)/more-specific-types-etc
2 parents bf955be + 1e3421d commit 26b369f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
schedule:
1515
- cron: '0 0 * * *'
1616
workflow_dispatch:
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
cancel-in-progress: true
1720
jobs:
1821
security-check:
1922
name: PHP Security Checker

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get update \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
21-
COPY --from=mlocati/php-extension-installer:2.1.54 /usr/bin/install-php-extensions /usr/local/bin/
21+
COPY --from=mlocati/php-extension-installer:2.1.58 /usr/bin/install-php-extensions /usr/local/bin/
2222

2323
# Install and enable all necessary PHP extensions
2424
RUN install-php-extensions \
@@ -31,7 +31,7 @@ RUN install-php-extensions \
3131
zip
3232

3333
# Copy the Composer PHAR from the Composer image into the PHP image
34-
COPY --from=composer:2.6.4 /usr/bin/composer /usr/bin/composer
34+
COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer
3535

3636
# Enable Composer autocompletion
3737
RUN composer completion bash > /etc/bash_completion.d/composer

Dockerfile_dev

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG HOST_GID
1010
# Declare constants
1111
ENV PATH "$PATH:/home/dev/.composer/vendor/bin:/app/vendor/bin"
1212
ENV NVM_VERSION v0.39.5
13-
ENV NODE_VERSION 20.8.0
13+
ENV NODE_VERSION 21.1.0
1414

1515
# Update package list and install necessary libraries
1616
RUN apt-get update \
@@ -56,7 +56,7 @@ ENV LANGUAGE en_US:en
5656
ENV LC_ALL en_US.UTF-8
5757

5858
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
59-
COPY --from=mlocati/php-extension-installer:2.1.54 /usr/bin/install-php-extensions /usr/local/bin/
59+
COPY --from=mlocati/php-extension-installer:2.1.58 /usr/bin/install-php-extensions /usr/local/bin/
6060

6161
# Enable all necessary PHP packages
6262
RUN install-php-extensions \
@@ -70,7 +70,7 @@ RUN install-php-extensions \
7070
zip
7171

7272
# Copy the Composer PHAR from the Composer image into the PHP image
73-
COPY --from=composer:2.6.4 /usr/bin/composer /usr/bin/composer
73+
COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer
7474

7575
# Enable Composer autocompletion
7676
RUN composer completion bash > /etc/bash_completion.d/composer

0 commit comments

Comments
 (0)