diff --git a/.gitignore b/.gitignore index 09eb20a6..87817df3 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ node_modules/ .classpath .project .settings/ +docs/BDD_video.mp4 diff --git a/README.md b/README.md index cef0ff62..a6e60760 100644 --- a/README.md +++ b/README.md @@ -183,3 +183,5 @@ For example, to set it all up on a [local Windows box](https://raw.githubusercon ![SonarQube analysis](https://c2.staticflickr.com/8/7823/33202009548_e678128200_b.jpg) ![Running performance tests](https://c2.staticflickr.com/8/7854/47077017751_7e045f68dd_b.jpg) + +Change made to demonstrate push and pull request... \ No newline at end of file diff --git a/build.gradle b/build.gradle index ff7b120e..876776d6 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ plugins { // gretty is a gradle plugin to make it easy to run a server and hotswap code at runtime. // https://plugins.gradle.org/plugin/org.gretty - id 'org.gretty' version '3.0.4' + id 'org.gretty' version '3.0.6' // provides access to a database versioning tool. id "org.flywaydb.flyway" version "6.0.8" @@ -663,4 +663,3 @@ task runPerfTests(type:Exec) { } - diff --git a/desktop_app/gradle/wrapper/gradle-wrapper.properties b/desktop_app/gradle/wrapper/gradle-wrapper.properties index f371643e..e750102e 100644 --- a/desktop_app/gradle/wrapper/gradle-wrapper.properties +++ b/desktop_app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/dockerfile b/dockerfile new file mode 100644 index 00000000..c7e350db --- /dev/null +++ b/dockerfile @@ -0,0 +1,39 @@ +FROM ubuntu:22.04 +COPY . /project +WORKDIR /project + +#install tool +RUN apt-get update && apt-get install -y \ + wget \ + curl \ + software-properties-common +# #python +# RUN apt-get install -y python3 python3-pip && \ +# ln -s /usr/bin/python3 /usr/bin/python +#java +RUN apt-get install -y openjdk-17-jdk +RUN apt-get install -y openjdk-17-jre +# RUN java -version && python --version +RUN java -version +#unzip +RUN apt-get update && apt-get install -y unzip +# #gradle +ENV GRADLE_VERSION=8.13 +RUN wget https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip -O /tmp/gradle.zip && \ + unzip /tmp/gradle.zip -d /opt && \ + rm /tmp/gradle.zip +ENV GRADLE_HOME=/opt/gradle-${GRADLE_VERSION} +ENV PATH=$PATH:$GRADLE_HOME/bin +#chorme driver +RUN CHROMEDRIVER_VERSION=$(wget -qO - https://chromedriver.storage.googleapis.com/LATEST_RELEASE) && \ + wget -q -O /tmp/chromedriver.zip https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip && \ + unzip /tmp/chromedriver.zip -d /usr/local/bin/ && \ + rm /tmp/chromedriver.zip +RUN chmod +x /usr/local/bin/chromedriver +RUN chromedriver --version + +#Clean +RUN apt-get clean && rm -rf /var/lib/apt/lists/* + +EXPOSE 8080 +# CMD [ "./gradlew","apprun" ] \ No newline at end of file diff --git a/docs/BDD_video.mp4 b/docs/BDD_video.mp4 index 27c4646c..571239ed 100644 Binary files a/docs/BDD_video.mp4 and b/docs/BDD_video.mp4 differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643e..e750102e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties b/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties index f371643e..e750102e 100644 --- a/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties +++ b/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists