diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1b4e6cd..22531fa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -105,3 +105,16 @@ jobs: export IMAGE_TEMPLATE=${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }} export IMAGE_TAG=${{ env.DOCKER_NAMESPACE }}:latest make test + + - name: 🔍 Run Docker Scout + id: docker-scout + uses: docker/scout-action@v1 + with: + command: cves,recommendations + ignore-unchanged: true + only-fixed: true + only-severities: critical,high + keep-previous-comments: false + github-token: ${{ secrets.GITHUB_TOKEN }} + dockerhub-user: ${{ secrets.DOCKER_USERNAME }} + dockerhub-password: ${{ secrets.DOCKER_TOKEN }} diff --git a/Makefile b/Makefile index 1241779..5f07ee7 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ export DOCKER_BUILDKIT ?= 1 export COMPOSE_DOCKER_CLI_BUILD ?= 1 IMAGE_NAMESPACE ?= wayofdev/php-dev -IMAGE_TEMPLATE ?= 8.2-fpm-alpine +IMAGE_TEMPLATE ?= 8.3-cli-alpine IMAGE_TAG ?= $(IMAGE_NAMESPACE):$(IMAGE_TEMPLATE)-latest DOCKERFILE_DIR ?= ./dist/dev/$(IMAGE_TEMPLATE) diff --git a/src/Dockerfiles/dev/Dockerfile.j2 b/src/Dockerfiles/dev/Dockerfile.j2 index 418cab4..20edf94 100644 --- a/src/Dockerfiles/dev/Dockerfile.j2 +++ b/src/Dockerfiles/dev/Dockerfile.j2 @@ -41,6 +41,11 @@ RUN set -eux; \ # Composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \ {% endif %} +{% if true == install_phive %} + # Phive + && curl -sSL https://phar.io/releases/phive.phar -o /usr/local/bin/phive \ + && chmod +x /usr/local/bin/phive \ +{% endif %} {% if 'cli' == php_type %} {% if true == install_postgres_client %} && apk add --no-cache \ diff --git a/src/Dockerfiles/dev/goss.yaml.j2 b/src/Dockerfiles/dev/goss.yaml.j2 index 76ddf85..1f328da 100644 --- a/src/Dockerfiles/dev/goss.yaml.j2 +++ b/src/Dockerfiles/dev/goss.yaml.j2 @@ -87,6 +87,12 @@ command: - "Composer version" exit-status: 0 {% endif %} +{% if true == install_phive %} + "phive --version": + stdout: + - "Phive 0." + exit-status: 0 +{% endif %} {% if true == install_faketime %} "cat /etc/ld.so.preload": stdout: diff --git a/src/group_vars/dev.yml b/src/group_vars/dev.yml index 4ab4a27..727334c 100644 --- a/src/group_vars/dev.yml +++ b/src/group_vars/dev.yml @@ -48,6 +48,7 @@ ext_pecl_enabled: - pdo_sqlsrv install_composer: true +install_phive: true install_faketime: true install_postgres_client: false @@ -61,5 +62,6 @@ system_packages: - nano - wait4x - openssh + - gnupg ...