Skip to content

Commit

Permalink
Merge pull request #354 from DataDog/ara.pulido/7_50
Browse files Browse the repository at this point in the history
Pin versions 7.50 and release
  • Loading branch information
arapulido authored Dec 20, 2023
2 parents 4344051 + 07335ae commit 8e1862b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.17] - 2023-12-20

### Added
- Datadog Agent pinned versions are now `7.50.0` and `6.50.0`.

## [2.16] - 2023-11-08

### Added
Expand Down
11 changes: 2 additions & 9 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ set -o pipefail
# set -x

# Set agent pinned version
DD_AGENT_PINNED_VERSION_6="6.49.0-1"
DD_AGENT_PINNED_VERSION_7="7.49.0-1"
DD_AGENT_PINNED_VERSION_6="6.50.0-1"
DD_AGENT_PINNED_VERSION_7="7.50.0-1"

# Parse and derive params
BUILD_DIR=$1
Expand Down Expand Up @@ -202,13 +202,6 @@ for i in "${DELETE_PACKAGES[@]}"; do
rm -rf "$APT_DIR"/opt/datadog-agent/embedded/lib/python*/site-packages/"$i"
done

POSTGRES_BINARIES=(postgres postmaster psql reindexdb vacuumdb createuser clusterdb createdb dropuser dropdb initdb pg_test_timing pg_archivecleanup pg_config pg_test_fsync pg_controldata pg_isready pg_resetwal pg_ctl pg_receivewal pg_recvlogical pg_rewind pg_waldump pg_dumpall pg_basebackup pg_upgrade pgbench pg_restore pg_dump ecpg)

# Remove Postgres binaries
for i in "${POSTGRES_BINARIES[@]}"; do
rm -rf "$APT_DIR"/opt/datadog-agent/embedded/bin/"$i"
done

# Remove the system-probe binary and share folder, only needed for npm, security
rm -rf "$APT_DIR/opt/datadog-agent/embedded/bin/system-probe"
rm -rf "$APT_DIR/opt/datadog-agent/embedded/share/system-probe/"
Expand Down
2 changes: 1 addition & 1 deletion extra/datadog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ done
# Add tags to the config file
DYNOHOST="$(hostname )"
DYNOTYPE=${DYNO%%.*}
BUILDPACKVERSION="dev"
BUILDPACKVERSION="2.17"
DYNO_TAGS="dyno:$DYNO dynotype:$DYNOTYPE buildpackversion:$BUILDPACKVERSION"

# We want always to have the Dyno ID as a host alias to improve correlation
Expand Down

0 comments on commit 8e1862b

Please sign in to comment.