Merge branch 'master' into dev

Ree6-Applications · Jun 18, 2023 · 075797f · 075797f
2 parents 89742af + aae3027
commit 075797f
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 70 deletions.
diff --git a/.github/workflows/dockerPush.yml b/.github/workflows/dockerPush.yml
@@ -30,12 +30,12 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4.5.0
+        uses: docker/metadata-action@v4.6.0
         with:
           images: prestischmesti/ree6-webinterface
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v4.1.1
         with:
           context: Backend/
           push: true

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -29,5 +29,5 @@ jobs:
     - name: Upload Artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: Ree6-all
+        name: Ree6-Webinterface-all
         path: staging
diff --git a/Dockerfile → Backend/Dockerfile b/Dockerfile → Backend/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
 
 FROM maven:3.9.2-amazoncorretto-17 AS build
-COPY Backend/src /usr/src/app/src
-COPY Backend/pom.xml /usr/src/app
+COPY src /usr/src/app/src
+COPY pom.xml /usr/src/app
 RUN mvn -f /usr/src/app/pom.xml clean package
 
 FROM amazoncorretto:17-alpine3.16-full
 ARG JAR_FILE=/usr/src/app/target/*.jar
 COPY --from=build ${JAR_FILE} /usr/app/Ree6-Webinterface.jar
-EXPOSE 8080/tcp
-ENTRYPOINT ["java","-jar","/usr/app/Ree6-Webinterface.jar"]
+EXPOSE 8888/tcp
+ENTRYPOINT ["java","-jar","/usr/app/Ree6-Webinterface.jar"]
diff --git a/Backend/pom.xml b/Backend/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>de.presti.ree6</groupId>
     <artifactId>Webinterface-Backend</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <name>Webinterface-Backend</name>
     <description>The Backend for the Webinterface</description>
 
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>de.ree6</groupId>
             <artifactId>Ree6-SQL</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
 
         <!-- Discord -->
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-spring-boot-starter</artifactId>
-            <version>6.22.0</version>
+            <version>6.23.0</version>
         </dependency>
 
         <!-- Utilities -->

diff --git a/Frontend/package-lock.json b/Frontend/package-lock.json
diff --git a/Frontend/src/lib/scripts/constants.ts b/Frontend/src/lib/scripts/constants.ts
@@ -1,4 +1,4 @@
-export const BASE_PATH = "http://localhost:8888"
+export const BASE_PATH = "https://api.ree6.de"
 
 export function get(path: string) {
 
@@ -75,4 +75,4 @@ export async function post_js(path: string, body: string) {
     }
 
     return json
-}
+}