Skip to content

Commit

Permalink
Merge pull request #374 from phpdocker-io/misc-fixes
Browse files Browse the repository at this point in the history
Misc fixes
  • Loading branch information
luispabon authored Aug 16, 2024
2 parents 9e25f8b + da14156 commit 4926e3f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:

# Mark issues and PRs with no activity as stale after a while, and close them after a while longer
- uses: actions/stale@v3
- uses: actions/stale@v9
with:
stale-issue-message: 'Marking issue as stale'
stale-pr-message: 'Marking PR as stale'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

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

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

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "dir=$(make composer-cache-dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion src/PHPDocker/Template/dockerfile-php-fpm.conf.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR "{{ dockerWorkingDir }}"
{% if packages %}
RUN apt-get update \
&& apt-get -y --no-install-recommends install \
{{ packages | join(' \\ \n ') }} \
{{ packages | join(' \\\n ') }} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
{% endif %}

0 comments on commit 4926e3f

Please sign in to comment.