Skip to content

Commit

Permalink
Simplified scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
algattik authored and cpeeyush committed Jul 25, 2022
1 parent 7cdb94e commit e8c73a4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ jobs:

- name: 'Copy Registration Service CLI'
run: |
mvn dependency:copy -Dartifact=org.eclipse.dataspaceconnector.registrationservice:registration-service-cli:0.0.1-SNAPSHOT:jar:all -DoutputDirectory=system-tests/resources/cli-tools
cd system-tests/resources/cli-tools
mv registration-service-cli-0.0.1-SNAPSHOT-all.jar registration-service-cli.jar
working-directory: .
mvn dependency:copy -Dartifact=org.eclipse.dataspaceconnector.registrationservice:registration-service-cli:$REGISTRATION_SERVICE_VERSION:jar:all -DoutputDirectory=.
mv registration-service-cli-$REGISTRATION_SERVICE_VERSION-all.jar registration-service-cli.jar
working-directory: system-tests/resources/cli-tools
env:
REGISTRATION_SERVICE_VERSION: 0.0.1-SNAPSHOT

- name: 'Run MVD docker-compose'
run: docker-compose -f system-tests/docker-compose.yml up --build --detach
Expand All @@ -49,4 +50,4 @@ jobs:
run: docker-compose -f system-tests/docker-compose.yml logs
if: always()
env:
REGISTRATION_SERVICE_LAUNCHER_PATH: ${{ runner.temp }}/RegistrationService/launcher
REGISTRATION_SERVICE_LAUNCHER_PATH: ${{ runner.temp }}/RegistrationService/launcher
9 changes: 3 additions & 6 deletions system-tests/resources/cli-tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# -buster is required to have apt available
FROM openjdk:17-slim-buster

WORKDIR /app

# Copy Registration Service client jar
COPY ./registration-service-cli.jar /app
COPY ./entrypoint.sh /app
COPY ./registration-service-cli.jar .
COPY ./entrypoint.sh .

RUN ["chmod", "+x", "/app/entrypoint.sh"]

ENTRYPOINT [ "/app/entrypoint.sh"]
ENTRYPOINT "/app/entrypoint.sh"
Empty file modified system-tests/resources/cli-tools/entrypoint.sh
100644 → 100755
Empty file.

0 comments on commit e8c73a4

Please sign in to comment.