Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added missing ps to fedora image
Browse files Browse the repository at this point in the history
intuibase committed Jan 16, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent de5c1bf commit 0e48087
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packaging/Makefile
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ BUILD_ARCH := $(if $(BUILD_ARCH),$(BUILD_ARCH),"x86-64")
ifeq ($(shell [ $(PHP_VERSION) \< 8.4 ] && echo true), true)
RPM_IMAGE_VERSION = 0.0.3 # PHP < 8.4 - image using centos
else
RPM_IMAGE_VERSION = 0.1.0 # PHP 8.4+ - image using fedora
RPM_IMAGE_VERSION = 0.1.1 # PHP 8.4+ - image using fedora
endif

export FPM_FLAGS=
2 changes: 1 addition & 1 deletion packaging/test/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@ services:
- PHP_VERSION=7.2

rpm-php84:
image: elasticobservability/apm-agent-php-dev:packages-test-rpm-php-8.4-0.1.0
image: elasticobservability/apm-agent-php-dev:packages-test-rpm-php-8.4-0.1.1
build:
context: fedora
dockerfile: Dockerfile
3 changes: 2 additions & 1 deletion packaging/test/fedora/Dockerfile
Original file line number Diff line number Diff line change
@@ -15,7 +15,8 @@ RUN dnf -y update && dnf install -y \
rsyslog \
unzip \
wget \
which
which \
procps

# && yum-config-manager --enable remi-php${PHP_VERSION_TRANSFORMED} \
RUN export PHP_VERSION_TRANSFORMED=$(echo "${PHP_VERSION}" | sed 's#\.##g') \

0 comments on commit 0e48087

Please sign in to comment.