Skip to content

Commit

Permalink
Trying to inject the Graylog version from the pom into the runtime do…
Browse files Browse the repository at this point in the history
…cker-compose for tests
  • Loading branch information
c8y3 committed Jun 12, 2024
1 parent de193f8 commit fcf9156
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@ jobs:
working-directory: plugin
run: |
mvn package --batch-mode
- name: Copy jar to backend tests runtime
- name: Prepare backend tests runtime
working-directory: plugin
run: |
mkdir runtime/graylog/plugin
cp ${{ steps.requestPom.outputs.JAR_PATH }} runtime/graylog/plugin
echo GRAYLOG_VERSION=${{ steps.requestPom.outputs.GRAYLOG_VERSION }} > .env
- name: Cache backend tests python dependences
uses: actions/cache@v3
with:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
/node/
/node_modules/

# Location for built plugin
# For the runtime dockre-compose
/runtime/graylog/plugin/
/runtime/.env

# For backend tests in python
/validation/graylog/__pycache__/
Expand Down
2 changes: 1 addition & 1 deletion runtime/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:

# Graylog: https://hub.docker.com/r/graylog/graylog/
graylog:
image: "graylog/graylog:5.1.13"
image: "graylog/graylog:${GRAYLOG_VERSION?Missing GRAYLOG_VERSION. Create a .env from pom: echo GRAYLOG_VERSION=$(cd ..&&mvn help:evaluate -Dexpression=project.parent.version -q -DforceStdout) > .env}"
container_name: graylog
links:
- mongo:mongo
Expand Down

0 comments on commit fcf9156

Please sign in to comment.