Merge pull request #106 from livepoll/develop

Continuous release
livepoll · Jun 14, 2021 · f495a56 · f495a56
2 parents ab7909d + 316bfc5
commit f495a56
Show file tree

Hide file tree

Showing 61 changed files with 1,091 additions and 608 deletions.
diff --git a/.github/scripts/docker-compose.yml b/.github/scripts/docker-compose.yml
@@ -26,6 +26,7 @@ services:
       LIVE_POLL_MYSQL_USER: livepoll
       LIVE_POLL_MYSQL_PASSWORD: M3uBcPLbM7RmgX4C3wAUej6WPzq886
       LIVE_POLL_DEV_URL: localhost:4200
+      LIVE_POLL_FRONTEND_URL: localhost:4200
       LIVE_POLL_SERVER_URL: localhost:8080
       LIVE_POLL_MAIL_HOST: ${LIVE_POLL_MAIL_HOST}
       LIVE_POLL_MAIL_PORT: ${LIVE_POLL_MAIL_PORT}
@@ -41,12 +42,6 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    healthcheck:
-      test: "curl --fail --silent localhost:8080/actuator/health | grep UP || exit 1"
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 40s
 
 networks:
   app-db: {}
diff --git a/.github/workflows/ci-with-docker-develop.yml b/.github/workflows/ci-with-docker-develop.yml
@@ -27,6 +27,7 @@ jobs:
           LIVE_POLL_MYSQL_USER: ${{ secrets.API_LIVE_POLL_MYSQL_USER }}
           LIVE_POLL_MYSQL_PASSWORD: ${{ secrets.API_LIVE_POLL_MYSQL_PASSWORD }}
           LIVE_POLL_DEV_URL: ${{ secrets.API_LIVE_POLL_DEV_URL }}
+          LIVE_POLL_FRONTEND_URL: ${{ secrets.API_LIVE_POLL_FRONTEND_URL }}
           LIVE_POLL_SERVER_URL: ${{ secrets.API_LIVE_POLL_SERVER_URL }}
           LIVE_POLL_MAIL_HOST: ${{ secrets.API_LIVE_POLL_MAIL_HOST }}
           LIVE_POLL_MAIL_PORT: ${{ secrets.API_LIVE_POLL_MAIL_PORT }}

diff --git a/.github/workflows/ci-with-docker.yml b/.github/workflows/ci-with-docker.yml
@@ -29,6 +29,7 @@ jobs:
           LIVE_POLL_MYSQL_USER: ${{ secrets.API_LIVE_POLL_MYSQL_USER }}
           LIVE_POLL_MYSQL_PASSWORD: ${{ secrets.API_LIVE_POLL_MYSQL_PASSWORD }}
           LIVE_POLL_DEV_URL: ${{ secrets.API_LIVE_POLL_DEV_URL }}
+          LIVE_POLL_FRONTEND_URL: ${{ secrets.API_LIVE_POLL_FRONTEND_URL }}
           LIVE_POLL_SERVER_URL: ${{ secrets.API_LIVE_POLL_SERVER_URL }}
           LIVE_POLL_MAIL_HOST: ${{ secrets.API_LIVE_POLL_MAIL_HOST }}
           LIVE_POLL_MAIL_PORT: ${{ secrets.API_LIVE_POLL_MAIL_PORT }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,6 +29,7 @@ jobs:
           LIVE_POLL_MYSQL_USER: ${{ secrets.API_LIVE_POLL_MYSQL_USER }}
           LIVE_POLL_MYSQL_PASSWORD: ${{ secrets.API_LIVE_POLL_MYSQL_PASSWORD }}
           LIVE_POLL_DEV_URL: ${{ secrets.API_LIVE_POLL_DEV_URL }}
+          LIVE_POLL_FRONTEND_URL: ${{ secrets.API_LIVE_POLL_FRONTEND_URL }}
           LIVE_POLL_SERVER_URL: ${{ secrets.API_LIVE_POLL_SERVER_URL }}
           LIVE_POLL_MAIL_HOST: ${{ secrets.API_LIVE_POLL_MAIL_HOST }}
           LIVE_POLL_MAIL_PORT: ${{ secrets.API_LIVE_POLL_MAIL_PORT }}
@@ -61,9 +62,12 @@ jobs:
 
       - name: Install Newman
         run: sudo npm i -g newman
-
-      - name: API healthcheck
-        run: curl -sSLf --retry-delay 5 --retry 5 --retry-connrefused --insecure http://example.org > /dev/null
+
+      - name: Test Docker Container listing
+        run: docker ps
+
+      - name: Wait for API to come online
+        run: sleep 20s
 
       - name: Run Newman tests
-        run: newman run ./postman/Livepoll.postman_collection.json --iteration-count 3 --folder "Integration Test" --insecure
+        run: newman run ./postman/Livepoll.postman_collection.json --iteration-count 3 --folder "Integration Test" --insecure
diff --git a/env/docker-compose.yml b/env/docker-compose.yml
@@ -4,8 +4,8 @@ services:
         image: mysql:8.0
         container_name: live-poll-dev-environment-db-mysql
         volumes:
-            - ./volumes/mysql-data:/var/lib/mysql
-            - ./volumes/mysql-logs:/var/log/mysql
+            - ~/volumes/mysql-data:/var/lib/mysql
+            - ~/volumes/mysql-logs:/var/log/mysql
         networks:
             - mysql-phpmyadmin
         ports:

diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
         <relativePath/>
     </parent>
     <groupId>de.live-poll</groupId>
     <artifactId>api</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0</version>
     <name>Live-Poll</name>
     <description>API Backend for Live-Poll</description>
 
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.1</version>
         </dependency>
 
         <dependency>