Merge pull request #23 from CodeChillAlluna/develop

Develop

Author: Lulu300

.editorconfig

@@ -1,11 +1,9 @@
 # Code & Chill
+[![Server version](https://img.shields.io/github/tag/CodeChillAlluna/code-chill-server.svg?label=version&style=for-the-badge)](https://github.com/CodeChillAlluna/code-chill-server)
 [![Travis (.org) branch](https://img.shields.io/travis/CodeChillAlluna/code-chill-server/master.svg?style=for-the-badge)](https://travis-ci.org/CodeChillAlluna/code-chill-server) 
-[![Codacy branch 
-grade](https://img.shields.io/codacy/grade/35fabe502d4341cc9096e5e63812f348/master.svg?style=for-the-badge)](https://app.codacy.com/project/Lulu300/code-chill-server/dashboard) 
-[![Coveralls github 
-branch](https://img.shields.io/coveralls/github/CodeChillAlluna/code-chill-server/master.svg?style=for-the-badge)](https://coveralls.io/github/CodeChillAlluna/code-chill-server) 
-[![Code 
-Climate](https://img.shields.io/codeclimate/maintainability/CodeChillAlluna/code-chill-server.svg?style=for-the-badge)](https://codeclimate.com/github/CodeChillAlluna/code-chill-server) 
+[![Codacy branch grade](https://img.shields.io/codacy/grade/35fabe502d4341cc9096e5e63812f348/master.svg?style=for-the-badge)](https://app.codacy.com/project/Lulu300/code-chill-server/dashboard) 
+[![Coveralls github branch](https://img.shields.io/coveralls/github/CodeChillAlluna/code-chill-server/master.svg?style=for-the-badge)](https://coveralls.io/github/CodeChillAlluna/code-chill-server) 
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/CodeChillAlluna/code-chill-server.svg?style=for-the-badge)](https://codeclimate.com/github/CodeChillAlluna/code-chill-server) 
 [![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge)](https://opensource.org/licenses/Apache-2.0)
 
 Master project : Online development environment
@@ -21,8 +19,8 @@ This repository contains the server part of the project, if you want to check th
 
 ## Summary
 
-- Installation for contributing to this project (click [here](#development-environment))
-- Installation of the application (click [here](#installation))
+- [Installation for contributing to this project](#development-environment)
+- [Installation of the application](#installation)
 
 
 
@@ -76,14 +74,15 @@ To start or building the application or execute tests, you need to access the VM
 vagrant ssh
 ```
 
-Before starting the application don't forget to start the server. If you have not installed it yet click [here](https://github.com/CodeChillAlluna/code-chill-server).
 
 
-
-#### Start the application
+#### Start the API
 
 ```sh
 mvn spring-boot:run
+
+# You can also use our custom script to clean docker container before start
+./server run
 ```
 
 Then you can request : http://localhost:8080 to view use the API.
@@ -93,130 +92,35 @@ Then you can request : http://localhost:8080 to view use the API.
 #### Execute tests
 
 ```sh
-mvn test -DforkCount=0
+mvn test
+
+# You can also use our custom script to clean docker container before start
+./server test
 ```
 
 
 
 #### Build the application
 
 ```sh
-mvn clean package -DforkCount=0
-```
-
-
-
-## Installation 
+mvn clean package
 
-Here is the setup to installing the production environment if you want to use this project.
-
-### Requirements
-
-- [Docker](https://www.docker.com/)
-- [Docker Compose](https://docs.docker.com/compose/)
-
-
-
-### Configure & Start application
-
-Create a file named `application.yml` wherever you want and change the values you need.
-
-```javascript
-# config context path to "/" by setting an empty string
-server:
-  contextPath:
-
-
-spring:
-  # Spring profile
-  profiles: "prod"
-  # JACKSON
-  jackson:
-    serialization:
-      INDENT_OUTPUT: true
-  mail:
-    host: 
-    port: 587
-    username: "CHANGEME"
-    password: "CHANGEME"
-    smtp:
-      protocol: smtp
-      debug: true
-    properties.mail.smtp:
-      auth: true
-      starttls.enable: true
-
-  datasource:
-    url: jdbc:postgresql://code-chill-db/codechill
-    username: code
-    password: chill
-
-  jpa:
-    generate:
-      ddl: true
-    hibernate:
-      ddl-auto: update
-
-jwt:
-  header: Authorization
-  secret: mySecret
-  expiration: 604800
-  route:
-    authentication:
-      path: auth
-      refresh: refresh
-
-logging:
-  file: /var/log/codechill-server.log
-  pattern:
-    file: "%d %-5level [%thread] %logger : %msg%n"
-  level:
-    ROOT: ERROR
-
-app:
-  # URL of the docker API to use for client environment
-  dockerurl: http://localhost:2375
-  # URL of the server where Code&Chill is installed
-  clienturl: http://localhost:3000
-  # Range of port to use for user environment
-  minPort: 64000
-  maxPort: 64050
+# You can also use our custom script to clean docker container before start
+./server package
 ```
 
 
 
-Then create a file named `docker-compose.yml` wherever you want.
-
-```yaml
-version: "3.3"
-
-services:
-  code-chill-server:
-  	# You can use any version of our image
-    image: codechillaluna/code-chill-server:latest
-    volumes:
-    # Change "$HOME/config" by the folder where your application.yml is.
-    - $HOME/config:/config/
-    ports:
-    # Change the first value to the port you want to use on your host.
-    - "8080:8080"
-    depends_on:
-    - code-chill-db
-  code-chill-db:
-    image: postgres:10.5-alpine
-    environment:
-      # Change postgres credentials and database name.
-      POSTGRES_PASSWORD: chill
-      POSTGRES_USER: code
-      POSTGRES_DB: codechill
+#### Format your code
+
+```sh
+mvn fmt:format
 ```
 
+Remember to format your code before commit, otherwise your build will fail.
 
 
-Now you just have to go on the folder where your `docker-compose.yml` is and execute this command to start Code&Chill Server : 
 
-```sh
-docker-compose up
-```
+## Installation 
 
-Now you can install [Code&Chill Client](https://github.com/CodeChillAlluna/code-chill-client#installation) and start coding on Code&Chill !
+The procedure to install Code&Chill is accessible in our main [repository](https://github.com/CodeChillAlluna/code-chill#installation).

README.md

@@ -1 +1 @@
-1.3.0
+1.6.0

VERSION

@@ -2,11 +2,35 @@ FROM alpine:latest
 
 RUN apk update && apk upgrade && \
     apk add nginx && \
-    apk add openjdk8-jre && \
     apk add openrc && \
     rm -rf /var/cache/apk/* && \
     mkdir -p /run/nginx
 
+ENV JAVA_HOME /opt/openjdk-12
+ENV PATH $JAVA_HOME/bin:$PATH
+
+# https://jdk.java.net/
+ENV JAVA_VERSION 12-ea+29
+ENV JAVA_URL https://download.java.net/java/early_access/alpine/29/binaries/openjdk-12-ea+29_linux-x64-musl_bin.tar.gz
+ENV JAVA_SHA256 39c22481736ae8a054fc820ad0cc3f1d9ad3f3f00d8111775573fe6d04c18bf5
+# "For Alpine Linux, builds are produced on a reduced schedule and may not be in sync with the other platforms."
+
+RUN set -eux; \
+	\
+	wget -O /openjdk.tgz "$JAVA_URL"; \
+	echo "$JAVA_SHA256 */openjdk.tgz" | sha256sum -c -; \
+	mkdir -p "$JAVA_HOME"; \
+	tar --extract --file /openjdk.tgz --directory "$JAVA_HOME" --strip-components 1; \
+	rm /openjdk.tgz; \
+	\
+# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
+# https://openjdk.java.net/jeps/341
+	java -Xshare:dump; \
+	\
+# basic smoke test
+	java --version; \
+javac --version
+
 RUN mkdir /www
 RUN mkdir /config
 
@@ -16,6 +40,6 @@ COPY codechill-server.jar /www/
 
 RUN rc-update add nginx default
 
-EXPOSE 80 443
+EXPOSE 80 443 8080
 
-CMD ["/usr/bin/java", "-jar", "-Dspring.profiles.active=prod", "-Dspring.config.location=/config/application.yml", "/www/codechill-server.jar"]
+CMD ["java", "-jar", "-Dspring.profiles.active=prod", "-Dspring.config.location=/config/application.yml", "/www/codechill-server.jar"]

docker/DockerFile

@@ -6,6 +6,7 @@ server:
 spring:
   #Spring profile
   profiles: "prod"
+  mvc.async.request-timeout: -1 
   # JACKSON
   jackson:
     serialization:

docker/config/application.yml

@@ -5,7 +5,7 @@ docker_build=$docker_path/codechill-server.jar
 
 build_app () {
     # Build the app
-    mvn clean package -DforkCount=0
+    mvn clean package -DskipTests=true
 }
 
 build_dockerfile() {
@@ -23,12 +23,14 @@ deploy() {
     echo $TRAVIS_BRANCH
     if [ "$TRAVIS_BRANCH" == "master" ]
     then
+      echo "Master"
       VERSION=`cat VERSION`
       docker tag codechillaluna/code-chill-server codechillaluna/code-chill-server:latest
       docker push codechillaluna/code-chill-server:latest
     else
-      echo "else"
+      echo "Other branch"
       VERSION=$TRAVIS_BRANCH
+      echo $VERSION
     fi
     docker tag codechillaluna/code-chill-server codechillaluna/code-chill-server:$VERSION
     docker push codechillaluna/code-chill-server:$VERSION

install/deploy.sh

@@ -135,9 +135,12 @@ setup () {
   # Install git
   sudo apt-get install -y git
 
+  sudo apt install dos2unix
+
   # Install jdk
   sudo echo oracle-java11-installer shared/accepted-oracle-license-v1-2 select true | sudo /usr/bin/debconf-set-selections
   sudo add-apt-repository ppa:linuxuprising/java -y
+  sudo apt-get update -y
   sudo apt-get install -y oracle-java11-installer
   sudo apt-get install -y oracle-java11-set-default
 

install/install.sh

@@ -119,6 +119,20 @@
             <version>2.1.0.RELEASE</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
     </dependencies>
 
     <build>

pom.xml

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+clean_docker() {
+  docker stop $(docker ps -a -q)
+  docker rm $(docker ps -a -q)
+}
+
+format_code() {
+  mvn fmt:format
+}
+
+run_server() {
+  clean_docker
+  format_code
+  mvn spring-boot:run
+}
+
+run_test() {
+  clean_docker
+  format_code
+  mvn test
+}
+
+package() {
+  clean_docker
+  format_code
+  mvn clean package
+}
+
+if [ "$1" == "run" ]
+then
+  run_server
+elif [ "$1" == "test" ]
+then
+  run_test
+elif [ "$1" == "package" ]
+then
+  package
+elif [ "$1" == "format" ]
+then
+  format_code
+else
+  echo -e 'Wrong arg, Usage :\n1) run (Run the server)\n2) test (Run all tests)\n3) package (Make a jar)\n4) format (format code)'
+fi

server.sh

@@ -67,6 +67,8 @@ protected void configure(HttpSecurity httpSecurity) throws Exception {
         .antMatchers(
             HttpMethod.GET,
             "/",
+            "/containers/**",
+            "/images/**",
             "/*.html",
             "/favicon.ico",
             "/**/*.html",