Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add gnupg support for phive #38

Merged
merged 6 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions src/Dockerfiles/dev/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 6 additions & 0 deletions src/Dockerfiles/dev/goss.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions src/group_vars/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ ext_pecl_enabled:
- pdo_sqlsrv

install_composer: true
install_phive: true
install_faketime: true

install_postgres_client: false
Expand All @@ -61,5 +62,6 @@ system_packages:
- nano
- wait4x
- openssh
- gnupg

...