From 8bebd4a7eae67a8ea8a4a07de284e92996cf7a03 Mon Sep 17 00:00:00 2001 From: lotyp Date: Sat, 6 Apr 2024 04:43:10 +0300 Subject: [PATCH] feat: new ci build workflow --- .hadolint.yaml | 3 +++ Makefile | 12 +++--------- src/Dockerfiles/base/Dockerfile.j2 | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 .hadolint.yaml diff --git a/.hadolint.yaml b/.hadolint.yaml new file mode 100644 index 0000000..89e6379 --- /dev/null +++ b/.hadolint.yaml @@ -0,0 +1,3 @@ +trustedRegistries: + - docker.io + - "*.gcr.io" diff --git a/Makefile b/Makefile index 3251171..4be5f5d 100644 --- a/Makefile +++ b/Makefile @@ -126,19 +126,13 @@ lint-ansible: ## Lint ansible files inside project .PHONY: lint-ansible lint-docker: ## Run hadolint linter over dist Dockerfiles - hadolint -V ./dist/base/7.4-cli-alpine/Dockerfile - hadolint -V ./dist/base/7.4-fpm-alpine/Dockerfile - hadolint -V ./dist/base/7.4-fpm-supervisord/Dockerfile - hadolint -V ./dist/base/8.0-cli-alpine/Dockerfile - hadolint -V ./dist/base/8.0-fpm-alpine/Dockerfile - hadolint -V ./dist/base/8.0-fpm-supervisord/Dockerfile hadolint -V ./dist/base/8.1-cli-alpine/Dockerfile hadolint -V ./dist/base/8.1-fpm-alpine/Dockerfile - hadolint -V ./dist/base/8.1-fpm-supervisord/Dockerfile + hadolint -V ./dist/base/8.1-supervisord-alpine/Dockerfile hadolint -V ./dist/base/8.2-cli-alpine/Dockerfile hadolint -V ./dist/base/8.2-fpm-alpine/Dockerfile - hadolint -V ./dist/base/8.2-fpm-supervisord/Dockerfile + hadolint -V ./dist/base/8.2-supervisord-alpine/Dockerfile hadolint -V ./dist/base/8.3-cli-alpine/Dockerfile hadolint -V ./dist/base/8.3-fpm-alpine/Dockerfile - hadolint -V ./dist/base/8.3-fpm-supervisord/Dockerfile + hadolint -V ./dist/base/8.3-supervisord-alpine/Dockerfile .PHONY: lint-docker diff --git a/src/Dockerfiles/base/Dockerfile.j2 b/src/Dockerfiles/base/Dockerfile.j2 index 9859a36..01c4ff7 100644 --- a/src/Dockerfiles/base/Dockerfile.j2 +++ b/src/Dockerfiles/base/Dockerfile.j2 @@ -41,7 +41,7 @@ COPY --chown=www-data ./configs/php.ini /usr/local/etc/php/conf.d/php.ini RUN set -eux; \ apk -U upgrade -a \ {% if 'supervisord' == php_type %} - && apk add --no-cache supervisor \ + && apk add --no-cache supervisor=4.2.5-r4 \ {% endif %} && \ curl -sSLf \