Skip to content

Commit

Permalink
refactor: move http-request-logger-wrapper.yaml to test directory
Browse files Browse the repository at this point in the history
  • Loading branch information
hamidonos committed Oct 27, 2023
1 parent 9a02841 commit fcd18e2
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

public class HttpRequestLoggerUtil {

private static final String HTTP_REQUEST_LOGGER_DOCKER_COMPOSE_FILE_PATH = "util/http-request-logger/docker-compose.yaml";
private static final String HTTP_REQUEST_LOGGER_DOCKER_COMPOSE_FILE_PATH = "system-tests/src/test/java/org/eclipse/edc/samples/util/http-request-logger-wrapper.yaml";

private static final String HTTP_REQUEST_LOGGER = "http-request-logger";

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This wraps the http request logger container in the correct context (project root).
# Needed for test execution.

version: "3.8"

services:
http-request-logger:
image: http-request-logger
build:
context: ../../../../../../../../..
dockerfile: util/http-request-logger/Dockerfile
ports:
- "4000:4000"
3 changes: 2 additions & 1 deletion transfer/transfer-02-consumer-pull/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ As a pre-requisite, you need to have a http server that runs on port 4000 and lo
be mandatory to get the EndpointDataReference that will be used to get the data.

```bash
docker-compose -f util/http-request-logger/docker-compose.yaml up --abort-on-container-exit
docker build -f util/http-request-logger/Dockerfile -t http-request-logger .
docker run -p 4000:4000 http-request-logger
```

### 2. Start the transfer
Expand Down
4 changes: 3 additions & 1 deletion util/http-request-logger/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ RUN gradle util:http-request-logger:build
FROM openjdk:17-slim

WORKDIR /app
COPY --from=build /home/gradle/project/util/http-request-logger/build/libs/http-request-logger.jar /app/http-request-logger.jar
COPY --from=build /home/gradle/project/util/http-request-logger/build/libs/http-request-logger.jar /app/http-request-logger.jar

CMD ["java","-jar","/app/http-request-logger.jar"]
11 changes: 0 additions & 11 deletions util/http-request-logger/docker-compose.yaml

This file was deleted.

0 comments on commit fcd18e2

Please sign in to comment.