Support APK with FPM #92

v1v · 2020-07-20T12:02:59Z

Enable alpine packaging support

What

Build/Test/Generate-SO-Package for alpine requires an alpine docker image
CI matrix for PHP-VERSIONS and Dockerfile/Dockerfile.alpine.
fpm issues for packaging alpine has been solved with the patch approach. [apk] "BAD archive" error when installing .apk built using fpm jordansissel/fpm#1227
tar package will contain all the so files (including the alpine ones).
alpine so files contain the -alpine prefix to support the packaging for tarballs.

Issues

Closes #73

Test

Create everything!

## testing everything for PHP_VERSION 7.2
DOCKERFILE=Dockerfile.alpine make -f .ci/Makefile build test composer
make -f .ci/Makefile build test composer

## testing everything for PHP_VERSION 7.3
PHP_VERSION=7.3 DOCKERFILE=Dockerfile.alpine make -f .ci/Makefile build test composer
PHP_VERSION=7.3 make -f .ci/Makefile build test composer

## testing everything for PHP_VERSION 7.4
PHP_VERSION=7.4 DOCKERFILE=Dockerfile.alpine make -f .ci/Makefile build test composer
PHP_VERSION=7.4 make -f .ci/Makefile build test composer

## generate package
DOCKERFILE=Dockerfile.alpine make -f .ci/Makefile build generate-for-package
make -f .ci/Makefile build generate-for-package
PHP_VERSION=7.3 DOCKERFILE=Dockerfile.alpine make -f .ci/Makefile build generate-for-package
PHP_VERSION=7.3 make -f .ci/Makefile build generate-for-package
PHP_VERSION=7.4 DOCKERFILE=Dockerfile.alpine make -f .ci/Makefile build generate-for-package
PHP_VERSION=7.4 make -f .ci/Makefile build generate-for-package
make -C packaging package

## Install testing
PHP_VERSION=7.2 make -C packaging install
PHP_VERSION=7.3 make -C packaging install
PHP_VERSION=7.4 make -C packaging install

apmmachine · 2020-07-20T12:11:42Z

💚 Build Succeeded

Expand to view the summary

Build stats

Build Cause: [Pull request #92 updated]
Start Time: 2020-08-19T11:28:14.574+0000
Duration: 18 min 11 sec

Test stats 🧪

Test	Results
Failed	0
Passed	195
Skipped	0
Total	195

* upstream/master: packaging: debian package installation with post-install (elastic#98) DOCS: create DEVELOPMENT.md docs (elastic#95) [CI] add build badge status (elastic#87) Docs: add help make goal and enhance the docs (elastic#93)

* upstream/master: [packaging] support centOS smoke testing (elastic#99)

* upstream/master: Packaging tar with installing tests (elastic#103) Handle "service_version" as well Handle 'too long' case as well Fix "service_name option has no effect" bug [CI] distribution binaries stored in the PHP version folder (elastic#101) [CI] use packer cache and normalise docker images (elastic#102)

* upstream/master: Add ENVIRONMENT configuration option Change composer installation in docker (elastic#128) Add tests/APM_Agents_shared directory [packaging] support multiple PHP API (elastic#121) [Packaging] restore php.ini if something bad happened (elastic#116) [CI] Cosmetic changes in the stage names (elastic#115)

v1v · 2020-08-18T08:40:30Z

.ci/generate-for-package.sh

@@ -6,7 +6,7 @@ HYPHEN="-"
 MODULES_DIR=/app/src/ext/modules
 NAME=elastic_apm
 ## Prepare context where to copy the previous generated so files
-GENERATED=$(mktemp -d /tmp/dir-XXXX)
+GENERATED=$(mktemp -d /tmp/dirXXXXXX)


Forced to use this template to support alpine

v1v · 2020-08-19T09:59:57Z

.ci/Jenkinsfile

+            unstash 'generate-for-package-7.2-Dockerfile'
+            unstash 'generate-for-package-7.3-Dockerfile'
+            unstash 'generate-for-package-7.4-Dockerfile'
+            unstash 'generate-for-package-7.2-Dockerfile.alpine'
+            unstash 'generate-for-package-7.3-Dockerfile.alpine'
+            unstash 'generate-for-package-7.4-Dockerfile.alpine'


It's not the smartest approach but it's native to the CI. So we might need to find a better way in some follow ups

v1v · 2020-08-19T10:00:36Z

.ci/Makefile

+DOCKERFILE ?= Dockerfile
+SUFFIX := 
+ifeq ($(DOCKERFILE), Dockerfile.alpine)
+    SUFFIX := alpine
+endif


This will help to either use the default php-fpm docker image or the alpine one as long as the DOCKERFILE env variable is set

v1v · 2020-08-19T10:01:20Z

packaging/create-package.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env sh


Refactored to be in a script then the so files filtering can happen easily

v1v · 2020-08-19T10:02:13Z

packaging/post-install.sh

+    ## If alpine then add another suffix
+    if grep -q -i alpine /etc/os-release; then
+        SUFFIX=-alpine
+    fi
+    echo "${EXTENSION_DIR}/elastic_apm-${PHP_API}${SUFFIX}.so"


We could potentially skip this particular implementation if the tar.gz distribution does not contain the alpine so files.

.ci/Makefile

…utomation-tag-based * upstream/master: Support APK with FPM (elastic#92) Add ENVIRONMENT configuration option Change composer installation in docker (elastic#128) Add tests/APM_Agents_shared directory

Support APK with FPM

a85d9a7

v1v self-assigned this Jul 20, 2020

v1v added the automation label Jul 20, 2020

v1v added 2 commits July 23, 2020 12:41

enable installation tests for alpine

234fd5c

v1v mentioned this pull request Jul 23, 2020

Package Agent as .apk for Alpine Linux distro #73

Closed

v1v added 9 commits July 23, 2020 16:15

Merge remote-tracking branch 'upstream/master' into feature/support-apk

3a9e258

* upstream/master: [packaging] support centOS smoke testing (elastic#99)

customise the fpm version

84cb92e

fix typo with the double quotes

6faa4c3

No more hardcoded image name but using the makefile target name

737c032

Support building extension for alpine

3beafb7

Use fixed composer version

3cc45df

Fix busybox mktemp

2c5c0d0

v1v commented Aug 18, 2020

View reviewed changes

v1v and others added 4 commits August 18, 2020 12:55

Support SO alpine generation

0f4e801

Disable backtrace on non-glibc platforms (Alpine is one of those)

1d79513

Support alpine packaging and installation

2e5e1f6

Create package for each distribution

58b0cce

v1v commented Aug 19, 2020

View reviewed changes

v1v requested review from SergeyKleyman and a team August 19, 2020 10:37

v1v marked this pull request as ready for review August 19, 2020 10:37

mdelapenya reviewed Aug 19, 2020

View reviewed changes

.ci/Makefile Show resolved Hide resolved

mdelapenya approved these changes Aug 19, 2020

View reviewed changes

SergeyKleyman approved these changes Aug 19, 2020

View reviewed changes

As suggested in the code review

75452f7

v1v merged commit 0e513d0 into elastic:master Aug 19, 2020

v1v deleted the feature/support-apk branch August 19, 2020 11:49

SergeyKleyman mentioned this pull request Aug 19, 2020

Fix issues with building on Alpine Linux #140

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support APK with FPM #92

Support APK with FPM #92

v1v commented Jul 20, 2020 •

edited

Loading

apmmachine commented Jul 20, 2020 •

edited

Loading

Build stats

Test stats 🧪

v1v Aug 18, 2020

v1v Aug 19, 2020

v1v Aug 19, 2020

v1v Aug 19, 2020

v1v Aug 19, 2020

Support APK with FPM #92

Support APK with FPM #92

Conversation

v1v commented Jul 20, 2020 • edited Loading

What

Issues

Test

apmmachine commented Jul 20, 2020 • edited Loading

💚 Build Succeeded

Build stats

Test stats 🧪

v1v Aug 18, 2020

Choose a reason for hiding this comment

v1v Aug 19, 2020

Choose a reason for hiding this comment

v1v Aug 19, 2020

Choose a reason for hiding this comment

v1v Aug 19, 2020

Choose a reason for hiding this comment

v1v Aug 19, 2020

Choose a reason for hiding this comment

v1v commented Jul 20, 2020 •

edited

Loading

apmmachine commented Jul 20, 2020 •

edited

Loading