walbeck-it/docker-getgrav
1
0
Fork 0
Code Issues 3 Pull requests 1 Releases Wiki Activity

Lint dockerfiles and add CI pipeline for linting #67

Merged
mwalbeck merged 9 commits from linting into master 2021-02-03 14:52:14 +00:00
Conversation 1 Commits 9 Files changed 8 +23 -41
5 changed files with 23 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5115fd3e6f - Show all commits

6
.hadolint.yaml Normal file
View file

@ -0,0 +1,6 @@
---
ignored:
- DL3008
- DL3003
- SC2164
- SC2086

14
1.6/Dockerfile
View file

@ -1,6 +1,6 @@
FROM php:7.3.26-fpm-buster@sha256:6bc677764c7f94da7c93a45e2831a6c1774001ff61e822011844fd79ae07b533 FROM php:7.3.26-fpm-buster@sha256:6bc677764c7f94da7c93a45e2831a6c1774001ff61e822011844fd79ae07b533
SHELL [ "/bin/bash", "-c" ] SHELL [ "/bin/bash", "-exo", "pipefail", "-c" ]
# renovate: datasource=github-tags depName=getgrav/grav versioning=semver # renovate: datasource=github-tags depName=getgrav/grav versioning=semver
ENV GRAV_VERSION 1.6.31 ENV GRAV_VERSION 1.6.31
@ -9,9 +9,7 @@ ENV PHP_APCU_VERSION v5.1.19
# renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver # renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver
ENV PHP_YAML_VERSION 2.2.1 ENV PHP_YAML_VERSION 2.2.1
RUN set -ex; \ RUN groupadd --system foo; \
\
groupadd --system foo; \
useradd --no-log-init --system --gid foo --create-home foo; \ useradd --no-log-init --system --gid foo --create-home foo; \
\ \
apt-get update; \ apt-get update; \
@ -23,9 +21,7 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN set -ex; \ RUN savedAptMark="$(apt-mark showmanual)"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@ -63,9 +59,7 @@ RUN set -ex; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN set -ex; \ RUN git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
\
git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
cd /usr/share/grav; \ cd /usr/share/grav; \
rm -rf \ rm -rf \
.editorconfig \ .editorconfig \

14
1.6/Dockerfile.prod
View file

@ -1,6 +1,6 @@
FROM php:7.3.26-fpm-buster@sha256:6bc677764c7f94da7c93a45e2831a6c1774001ff61e822011844fd79ae07b533 FROM php:7.3.26-fpm-buster@sha256:6bc677764c7f94da7c93a45e2831a6c1774001ff61e822011844fd79ae07b533
SHELL [ "/bin/bash", "-c" ] SHELL [ "/bin/bash", "-exo", "pipefail", "-c" ]
# renovate: datasource=github-tags depName=getgrav/grav versioning=semver # renovate: datasource=github-tags depName=getgrav/grav versioning=semver
ENV GRAV_VERSION 1.6.31 ENV GRAV_VERSION 1.6.31
@ -9,9 +9,7 @@ ENV PHP_APCU_VERSION v5.1.19
# renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver # renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver
ENV PHP_YAML_VERSION 2.2.1 ENV PHP_YAML_VERSION 2.2.1
RUN set -ex; \ RUN groupadd --force --system --gid 33 www-data; \
\
groupadd --force --system --gid 33 www-data; \
useradd --no-log-init --system --gid www-data --no-create-home --uid 33 www-data || true; \ useradd --no-log-init --system --gid www-data --no-create-home --uid 33 www-data || true; \
\ \
apt-get update; \ apt-get update; \
@ -23,9 +21,7 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN set -ex; \ RUN savedAptMark="$(apt-mark showmanual)"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@ -63,9 +59,7 @@ RUN set -ex; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN set -ex; \ RUN git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
\
git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
cd /usr/share/grav; \ cd /usr/share/grav; \
rm -rf \ rm -rf \
.editorconfig \ .editorconfig \

16
1.7/Dockerfile
View file

@ -1,6 +1,6 @@
FROM php:7.4.14-fpm-buster@sha256:e9efa237664ac68793c62a7eb202a0383cce7e82ac43fb7f71347c23f1b6d3c7 FROM php:7.4.14-fpm-buster@sha256:e9efa237664ac68793c62a7eb202a0383cce7e82ac43fb7f71347c23f1b6d3c7
SHELL [ "/bin/bash", "-c" ] SHELL [ "/bin/bash", "-exo", "pipefail", "-c" ]
# renovate: datasource=github-tags depName=getgrav/grav versioning=semver # renovate: datasource=github-tags depName=getgrav/grav versioning=semver
ENV GRAV_VERSION 1.7.5 ENV GRAV_VERSION 1.7.5
@ -9,9 +9,7 @@ ENV PHP_APCU_VERSION v5.1.19
# renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver # renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver
ENV PHP_YAML_VERSION 2.2.1 ENV PHP_YAML_VERSION 2.2.1
RUN set -ex; \ RUN groupadd --system foo; \
\
groupadd --system foo; \
useradd --no-log-init --system --gid foo --create-home foo; \ useradd --no-log-init --system --gid foo --create-home foo; \
\ \
apt-get update; \ apt-get update; \
@ -23,9 +21,7 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN set -ex; \ RUN savedAptMark="$(apt-mark showmanual)"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@ -44,7 +40,7 @@ RUN set -ex; \
; \ ; \
\ \
pecl install apcu-${PHP_APCU_VERSION:1}; \ pecl install apcu-${PHP_APCU_VERSION:1}; \
pecl install yaml-$PHP_YAML_VERSION; \ pecl install yaml $PHP_YAML_VERSION; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -63,9 +59,7 @@ RUN set -ex; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN set -ex; \ RUN git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
\
git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
cd /usr/share/grav; \ cd /usr/share/grav; \
rm -rf \ rm -rf \
.editorconfig \ .editorconfig \

14
1.7/Dockerfile.prod
View file

@ -1,6 +1,6 @@
FROM php:7.4.14-fpm-buster@sha256:e9efa237664ac68793c62a7eb202a0383cce7e82ac43fb7f71347c23f1b6d3c7 FROM php:7.4.14-fpm-buster@sha256:e9efa237664ac68793c62a7eb202a0383cce7e82ac43fb7f71347c23f1b6d3c7
SHELL [ "/bin/bash", "-c" ] SHELL [ "/bin/bash", "-exo", "pipefail", "-c" ]
# renovate: datasource=github-tags depName=getgrav/grav versioning=semver # renovate: datasource=github-tags depName=getgrav/grav versioning=semver
ENV GRAV_VERSION 1.7.3 ENV GRAV_VERSION 1.7.3
@ -9,9 +9,7 @@ ENV PHP_APCU_VERSION v5.1.19
# renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver # renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver
ENV PHP_YAML_VERSION 2.2.1 ENV PHP_YAML_VERSION 2.2.1
RUN set -ex; \ RUN groupadd --force --system --gid 33 www-data; \
\
groupadd --force --system --gid 33 www-data; \
useradd --no-log-init --system --gid www-data --no-create-home --uid 33 www-data || true; \ useradd --no-log-init --system --gid www-data --no-create-home --uid 33 www-data || true; \
\ \
apt-get update; \ apt-get update; \
@ -23,9 +21,7 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN set -ex; \ RUN savedAptMark="$(apt-mark showmanual)"; \
\
savedAptMark="$(apt-mark showmanual)"; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@ -63,9 +59,7 @@ RUN set -ex; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN set -ex; \ RUN git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
\
git clone --branch $GRAV_VERSION https://github.com/getgrav/grav.git /usr/share/grav; \
cd /usr/share/grav; \ cd /usr/share/grav; \
rm -rf \ rm -rf \
.editorconfig \ .editorconfig \