Skip to content

Commit

Permalink
Merge pull request #182 from jolicode/env
Browse files Browse the repository at this point in the history
Forward CI env vars in Docker containers
  • Loading branch information
lyrixx authored May 25, 2022
2 parents 78d01c8 + d329c63 commit 4ab7c4e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 3.8.0 (not released yet)

* Add documentation cookbook for using pg_activity
* Forward CI env vars in Docker containers

## 3.7.0 (2022-05-24)

Expand Down
6 changes: 6 additions & 0 deletions infrastructure/docker/docker-compose.builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ services:
- postgres
environment:
- COMPOSER_MEMORY_LIMIT=-1
# The following list contains the common environment variables exposed by CI platforms
- GITHUB_ACTIONS
- CI # Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari
- CONTINUOUS_INTEGRATION # Travis CI, Cirrus CI
- BUILD_NUMBER # Jenkins, TeamCity
- RUN_ID # TaskCluster, dsari
volumes:
- "../../${PROJECT_DIRECTORY}:/home/app/application:cached"
- "${COMPOSER_CACHE_DIR}:/home/app/.composer/cache"
Expand Down

0 comments on commit 4ab7c4e

Please sign in to comment.