diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index c224ad5..5ed8ccb 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/Backend/security/build.gradle.kts b/Backend/security/build.gradle.kts index bd380f5..d6d5734 100644 --- a/Backend/security/build.gradle.kts +++ b/Backend/security/build.gradle.kts @@ -10,8 +10,9 @@ kotlin { dependencies { implementation(project(":Backend:domain")) implementation(libs.java.jwt) - implementation(libs.argon2.jvm) + implementation(libs.argon2.jvm.nolibs) implementation(libs.kotlinx.datetime) + testImplementation(libs.argon2.jvm) testImplementation(testLibs.kotlin.test) testImplementation(testLibs.mockk) } diff --git a/Dockerfile b/Dockerfile index 897ccdd..10326d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,19 @@ -FROM node:22-alpine AS buildFrontend +FROM node:22-alpine AS build_frontend RUN corepack enable COPY ./Frontend /home/node/src WORKDIR /home/node/src RUN pnpm i --frozen-lockfile -RUN pnpm build +RUN pnpm build --outDir ./dist -FROM eclipse-temurin:23-jdk-alpine AS buildBackend +FROM eclipse-temurin:23-jdk-alpine AS build_backend COPY . /home/gradle/src -COPY --from=buildFrontend /home/node/src/dist /home/gradle/src/Backend/bootstrap/src/main/resources/static +COPY --from=build_frontend /home/node/src/dist /home/gradle/src/Backend/bootstrap/src/main/resources/static WORKDIR /home/gradle/src RUN ./gradlew shadowJar --no-daemon FROM eclipse-temurin:23-jre-alpine +RUN apk add --no-cache argon2-libs EXPOSE 8080:8080 RUN mkdir /app -COPY --from=buildBackend /home/gradle/src/Backend/bootstrap/build/libs/*.jar /app/jasstracker.jar +COPY --from=build_backend /home/gradle/src/Backend/bootstrap/build/libs/*.jar /app/jasstracker.jar ENTRYPOINT ["java","-jar","/app/jasstracker.jar"] diff --git a/DockerfileBuiltLocally b/DockerfileBuiltLocally index ace6603..1e6b46b 100644 --- a/DockerfileBuiltLocally +++ b/DockerfileBuiltLocally @@ -1,4 +1,5 @@ FROM eclipse-temurin:23-jre-alpine +RUN apk add --no-cache argon2-libs EXPOSE 8080:8080 RUN mkdir /app COPY ./Backend/bootstrap/build/libs/*.jar /app/jasstracker.jar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle.kts b/settings.gradle.kts index 4cdce98..2a54873 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencyResolutionManagement { versionCatalogs { - val kotlin = "2.1.0-Beta2" + val kotlin = "2.1.0-RC" val mockk = "1.13.13" val ktor = "3.0.1" val logback = "1.5.12" @@ -51,6 +51,7 @@ dependencyResolutionManagement { library("postgresql", "org.postgresql", "postgresql").version(postgresql) library("jooq", "org.jooq", "jooq").version(jooq) library("java-jwt", "com.auth0", "java-jwt").version(javaJwt) + library("argon2-jvm-nolibs", "de.mkammerer", "argon2-jvm-nolibs").version(argon2) library("argon2-jvm", "de.mkammerer", "argon2-jvm").version(argon2) library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").version(kotlin)