Add support for cflinuxfs4 stack #174

NouemanKHAL · 2023-07-04T08:58:13Z

This PR adds the ruby interpreter to the buildpack in order to add support for the cflinuxfs4 stack.

Follow up of #172

…e to include it

…installed

NouemanKHAL · 2023-07-04T09:17:47Z

rebase on master

…y-install

…g the previous PATH paths

bin/compile

sarah-witt · 2023-07-27T13:53:06Z

bin/compile

+  RUBY_CMD=$DEPS_DIR/$DEPS_IDX/bin/ruby
+fi
+
+echo "if ! which ruby > /dev/null; then


Suggested change

echo "if ! which ruby > /dev/null; then

echo "if ! which ruby > /dev/null; then

Can you add a comment here explaining why we do this?

NouemanKHAL added the changelog/Added Added features results into a minor version bump label Jul 4, 2023

NouemanKHAL marked this pull request as ready for review July 4, 2023 09:15

NouemanKHAL requested a review from a team as a code owner July 4, 2023 09:15

NouemanKHAL added 10 commits July 4, 2023 11:16

wip: convert python scripts to ruby

e4c9482

reset Dockerfile

d5bdc3a

reset datadog.yaml file

2b4d837

export new PATH with ruby/bin and update dd_export_env and safe_sourc…

d52a49a

…e to include it

add install-ruby script (must be compatible with dash)

9fc036a

remove install-ruby script

8e5a796

add ruby tarball to the source and install it offline

833897a

fix supply script: RUBY_TAR path and some code still using install-ruby

79e3fd1

update all the scripts to use instead of ruby

11df8bd

update all scripts to use RUBY_BIN as the existing binary if ruby is …

c1edf2d

…installed

NouemanKHAL force-pushed the noueman/install-ruby branch from 28cf31d to c1edf2d Compare July 4, 2023 09:17

NouemanKHAL added 4 commits July 4, 2023 11:19

fix supply to use existing ruby binary

1ea62e6

remove some extra code

1da767e

remove PATH export in dd_export_env as its not needed

efbc64a

match bin/compile with bin/supply

414b73e

NouemanKHAL marked this pull request as draft July 4, 2023 14:39

NouemanKHAL added 3 commits July 4, 2023 17:53

add download_ruby function to scripts/prepare.sh

b3f3d49

use the downloaded ruby tarball

371a164

update .gitignore to ignore the ruby_3.0.5.tgz file

02a6320

NouemanKHAL marked this pull request as ready for review July 4, 2023 15:55

NouemanKHAL added 6 commits July 19, 2023 11:43

WIP

e7793c6

dev 8

1eea0ac

add exports for ruby libs

30eff09

working ruby PATH export

aded312

remove RUBY_BIN from bin/supply and all RUBY_DIR paths to PATH

895756f

update Installing Ruby message

d9a9783

NouemanKHAL added 24 commits July 21, 2023 23:23

stop copying the ruby.tgz to DATADOG_DIR

fbcd54f

remove RUBY_DIR

ad3411f

remove ruby from test-endpoint.sh

d9a171f

export .global_env file with the PATH variable

9323837

use .global_env to remove RUBY_BIN from update_agent_config.sh

2ee5abd

fix the PATH export to always keep current PATH of the calling process

0acc5de

remove RUBY_BIN from run-datadog.sh

23f713d

fix redirect-logs.sh indirect using of ruby via the redirect function

9a29006

delete find_ruby func and RUBY_BIN from utils.sh

f374da8

print the VERSION from the file in config.yml

aa6e910

cleanup + fix VERSION file output to the config.yml

38fb15e

Merge remote-tracking branch 'origin/master' into noueman/working-rub…

4754905

…y-install

sync bin/compile with bin/supply

156f214

reset VERSION file

abe7d05

recompute DD_TAGS in test-endpoint.sh using ruby

89516d6

cleanup + output VERSION in the supply/compile scripts

28ad6d2

fix .global_env to import PATH only when ruby is missing

7999832

print ruby version in the same line

c0e570a

update bin/compile to match bin/supply

1d28a8c

fix .global_env to only add the buildpack directory to the PATH

724789f

update PATH exports to add the new paths to the end to avoid shadowin…

430ea4d

…g the previous PATH paths

make the compile script a symlink to supply script

d4d5d97

fix RUBY_CMD to point to the ruby bin

a0d0c87

revert bin/compile to symlink change

12b4d8e

sarah-witt reviewed Jul 27, 2023

View reviewed changes

NouemanKHAL added 2 commits July 27, 2023 17:22

cleanup + add comments

17ba16c

add ruby to 3rd-party license

670cb06

sarah-witt approved these changes Aug 2, 2023

View reviewed changes

NouemanKHAL merged commit 4ad8297 into master Aug 4, 2023
3 checks passed

NouemanKHAL deleted the noueman/install-ruby branch August 4, 2023 09:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for cflinuxfs4 stack #174

Add support for cflinuxfs4 stack #174

NouemanKHAL commented Jul 4, 2023

NouemanKHAL commented Jul 4, 2023

sarah-witt Jul 27, 2023

	echo "if ! which ruby > /dev/null; then
	echo "if ! which ruby > /dev/null; then

Add support for cflinuxfs4 stack #174

Add support for cflinuxfs4 stack #174

Conversation

NouemanKHAL commented Jul 4, 2023

NouemanKHAL commented Jul 4, 2023

sarah-witt Jul 27, 2023

Choose a reason for hiding this comment