Skip to content

Commit

Permalink
Merge pull request #37 from ucan-lab/chore-36-hadolint
Browse files Browse the repository at this point in the history
Add Hadolint GitHub Actions Workflow
  • Loading branch information
ucan-lab authored May 7, 2024
2 parents b65e3e8 + ed1c034 commit 269070f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/testing-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: hadolint/[email protected]
with:
recursive: true
- name: Docker Version
run: docker version
- name: Docker Compose Settings
Expand Down
28 changes: 9 additions & 19 deletions infra/docker/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ COPY --from=composer:2.7 /usr/bin/composer /usr/bin/composer
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
locales \
git \
unzip \
libzip-dev \
libicu-dev \
libonig-dev \
default-mysql-client
locales=2.31-13+deb11u10 \
git=1:2.30.2-1+deb11u2 \
unzip=6.0-26+deb11u1 \
libzip-dev=1.7.3-1 \
libicu-dev=67.1-7 \
libonig-dev=6.9.6-1.1 \
default-mysql-client=1.0.7
locale-gen en_US.UTF-8
localedef -f UTF-8 -i en_US en_US.UTF-8
docker-php-ext-install \
Expand All @@ -41,15 +41,12 @@ RUN <<EOF
chown phper:phper /composer
chown phper:phper /workspace
chown phper:phper /home/phper/.config/psysh
EOF

FROM base AS development

RUN <<EOF
apt-get clean
rm -rf /var/lib/apt/lists/*
EOF

FROM base AS development

COPY ./infra/docker/php/php.development.ini /usr/local/etc/php/php.ini

USER phper
Expand All @@ -59,8 +56,6 @@ FROM base AS development-xdebug
RUN <<EOF
pecl install xdebug
docker-php-ext-enable xdebug
apt-get clean
rm -rf /var/lib/apt/lists/*
EOF

COPY ./infra/docker/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
Expand All @@ -72,11 +67,6 @@ FROM base AS deploy
COPY ./infra/docker/php/php.deploy.ini /usr/local/etc/php/php.ini
COPY --chown=phper:phper ./src /workspace

RUN <<EOF
apt-get clean
rm -rf /var/lib/apt/lists/*
EOF

USER phper

RUN <<EOF
Expand Down

0 comments on commit 269070f

Please sign in to comment.