Skip to content

Commit 4926e3f

Browse files
authored
Merge pull request #374 from phpdocker-io/misc-fixes
Misc fixes
2 parents 9e25f8b + da14156 commit 4926e3f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/cleanup-repo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515

1616
# Mark issues and PRs with no activity as stale after a while, and close them after a while longer
17-
- uses: actions/stale@v3
17+
- uses: actions/stale@v9
1818
with:
1919
stale-issue-message: 'Marking issue as stale'
2020
stale-pr-message: 'Marking PR as stale'

.github/workflows/deploy.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131

3232
- name: Set up QEMU (required for arm build)
33-
uses: docker/setup-qemu-action@v2
33+
uses: docker/setup-qemu-action@v3
3434

3535
- name: Set up Docker Buildx
36-
uses: docker/setup-buildx-action@v2
36+
uses: docker/setup-buildx-action@v3
3737

3838
- name: Login to DockerHub
39-
uses: docker/login-action@v2
39+
uses: docker/login-action@v3
4040
with:
4141
username: ${{ secrets.DOCKERHUB_USERNAME }}
4242
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Get Composer Cache Directory
2424
id: composer-cache
2525
run: |
2626
echo "dir=$(make composer-cache-dir)" >> $GITHUB_OUTPUT
2727
28-
- uses: actions/cache@v3
28+
- uses: actions/cache@v4
2929
with:
3030
path: ${{ steps.composer-cache.outputs.dir }}
3131
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

src/PHPDocker/Template/dockerfile-php-fpm.conf.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR "{{ dockerWorkingDir }}"
44
{% if packages %}
55
RUN apt-get update \
66
&& apt-get -y --no-install-recommends install \
7-
{{ packages | join(' \\ \n ') }} \
7+
{{ packages | join(' \\\n ') }} \
88
&& apt-get clean \
99
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
1010
{% endif %}

0 commit comments

Comments
 (0)