From 9ec2791bcb3b51e5a244066aaea5ba5edc0e25e4 Mon Sep 17 00:00:00 2001 From: Pierre Tellier Date: Tue, 4 Feb 2025 15:47:06 +0100 Subject: [PATCH] feat: compilation now occurs in docker --- .../.gitattributes | 0 .../.gitignore | 0 MyINPulse-back/Dockerfile | 10 + .../build.gradle | 0 .../settings.gradle | 0 .../myinpulse/MyinpulseApplication.java | 0 .../enseirb/myinpulse/api/GetUserInfo.java | 0 .../src/main/resources/application.properties | 0 .../myinpulse/MyinpulseApplicationTests.java | 0 back/Dockerfile | 3 - back/MyINPulse-back/gradlew | 252 ------------------ docker-compose.yaml | 14 +- front/Dockerfile | 4 +- 13 files changed, 19 insertions(+), 264 deletions(-) rename {back/MyINPulse-back => MyINPulse-back}/.gitattributes (100%) rename {back/MyINPulse-back => MyINPulse-back}/.gitignore (100%) create mode 100644 MyINPulse-back/Dockerfile rename {back/MyINPulse-back => MyINPulse-back}/build.gradle (100%) rename {back/MyINPulse-back => MyINPulse-back}/settings.gradle (100%) rename {back/MyINPulse-back => MyINPulse-back}/src/main/java/enseirb/myinpulse/MyinpulseApplication.java (100%) rename {back/MyINPulse-back => MyINPulse-back}/src/main/java/enseirb/myinpulse/api/GetUserInfo.java (100%) rename {back/MyINPulse-back => MyINPulse-back}/src/main/resources/application.properties (100%) rename {back/MyINPulse-back => MyINPulse-back}/src/test/java/enseirb/myinpulse/MyinpulseApplicationTests.java (100%) delete mode 100644 back/Dockerfile delete mode 100755 back/MyINPulse-back/gradlew diff --git a/back/MyINPulse-back/.gitattributes b/MyINPulse-back/.gitattributes similarity index 100% rename from back/MyINPulse-back/.gitattributes rename to MyINPulse-back/.gitattributes diff --git a/back/MyINPulse-back/.gitignore b/MyINPulse-back/.gitignore similarity index 100% rename from back/MyINPulse-back/.gitignore rename to MyINPulse-back/.gitignore diff --git a/MyINPulse-back/Dockerfile b/MyINPulse-back/Dockerfile new file mode 100644 index 0000000..22cefe9 --- /dev/null +++ b/MyINPulse-back/Dockerfile @@ -0,0 +1,10 @@ +FROM gradle:8.12.1-jdk21-alpine AS build +COPY --chown=gradle:gradle . /home/gradle/src +WORKDIR /home/gradle/src +RUN gradle build --no-daemon + + + +FROM openjdk:21-jdk-slim +COPY --from=build /home/gradle/src/build/libs/*.jar /MyINPulse-back.jar +ENTRYPOINT ["java","-jar","/MyINPulse-back.jar"] \ No newline at end of file diff --git a/back/MyINPulse-back/build.gradle b/MyINPulse-back/build.gradle similarity index 100% rename from back/MyINPulse-back/build.gradle rename to MyINPulse-back/build.gradle diff --git a/back/MyINPulse-back/settings.gradle b/MyINPulse-back/settings.gradle similarity index 100% rename from back/MyINPulse-back/settings.gradle rename to MyINPulse-back/settings.gradle diff --git a/back/MyINPulse-back/src/main/java/enseirb/myinpulse/MyinpulseApplication.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/MyinpulseApplication.java similarity index 100% rename from back/MyINPulse-back/src/main/java/enseirb/myinpulse/MyinpulseApplication.java rename to MyINPulse-back/src/main/java/enseirb/myinpulse/MyinpulseApplication.java diff --git a/back/MyINPulse-back/src/main/java/enseirb/myinpulse/api/GetUserInfo.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/api/GetUserInfo.java similarity index 100% rename from back/MyINPulse-back/src/main/java/enseirb/myinpulse/api/GetUserInfo.java rename to MyINPulse-back/src/main/java/enseirb/myinpulse/api/GetUserInfo.java diff --git a/back/MyINPulse-back/src/main/resources/application.properties b/MyINPulse-back/src/main/resources/application.properties similarity index 100% rename from back/MyINPulse-back/src/main/resources/application.properties rename to MyINPulse-back/src/main/resources/application.properties diff --git a/back/MyINPulse-back/src/test/java/enseirb/myinpulse/MyinpulseApplicationTests.java b/MyINPulse-back/src/test/java/enseirb/myinpulse/MyinpulseApplicationTests.java similarity index 100% rename from back/MyINPulse-back/src/test/java/enseirb/myinpulse/MyinpulseApplicationTests.java rename to MyINPulse-back/src/test/java/enseirb/myinpulse/MyinpulseApplicationTests.java diff --git a/back/Dockerfile b/back/Dockerfile deleted file mode 100644 index 6cb11ba..0000000 --- a/back/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM openjdk:21-jdk -COPY MyINPulse-back/build/libs/myinpulse-0.0.1-SNAPSHOT.jar myinpulse.jar -ENTRYPOINT ["java","-jar","/myinpulse.jar"] \ No newline at end of file diff --git a/back/MyINPulse-back/gradlew b/back/MyINPulse-back/gradlew deleted file mode 100755 index f5feea6..0000000 --- a/back/MyINPulse-back/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# 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/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# 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 -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 - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/docker-compose.yaml b/docker-compose.yaml index a9318a0..e83b46d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -43,11 +43,11 @@ services: ports: - 8080:80 - #back: - # build: - # context: ./back/ - # dockerfile: Dockerfile - # container_name: MyINPulse-back - # ports: - # - 8081:8080 + back: + build: + context: ./MyINPulse-back/ + dockerfile: Dockerfile + container_name: MyINPulse-back + ports: + - 8081:8080 \ No newline at end of file diff --git a/front/Dockerfile b/front/Dockerfile index b6f5cca..14faeb6 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -5,13 +5,13 @@ FROM node:20-alpine AS build-stage WORKDIR /app # Copy the package.json and package-lock.json files to the working directory -COPY my-vue-app/package*.json ./ +COPY MyINPulse-front/package*.json ./ # Install dependencies RUN npm install # Copy the rest of the application code to the working directory -COPY my-vue-app . +COPY MyINPulse-front . # Build the Vue.js application for production RUN npm run build