arnekeller/Typicalc
1
0
Fork 0
mirror of https://gitlab.kit.edu/uskyk/typicalc.git synced 2024-11-08 18:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
uogau 2021-03-11 13:34:59 +01:00
commit 9767002ad1
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile
View File

@ -4,19 +4,19 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get update -qq && apt-get install -qq --no-install-recommends nodejs RUN apt-get update -qq && apt-get install -qq --no-install-recommends nodejs
# Stop running as root at this point # Stop running as root at this point
RUN useradd -m myuser RUN useradd -m typicalc
WORKDIR /usr/src/app/ WORKDIR /usr/src/app/
RUN chown myuser:myuser /usr/src/app/ RUN chown typicalc:typicalc /usr/src/app/
USER myuser USER typicalc
# Copy pom.xml and prefetch dependencies so a repeated build can continue from the next step with existing dependencies # Copy pom.xml and prefetch dependencies so a repeated build can continue from the next step with existing dependencies
COPY --chown=myuser pom.xml ./ COPY --chown=typicalc pom.xml ./
RUN mvn dependency:go-offline -Pproduction RUN mvn dependency:go-offline -Pproduction
# Copy all needed project files to a folder # Copy all needed project files to a folder
COPY --chown=myuser:myuser src src COPY --chown=typicalc:typicalc src src
COPY --chown=myuser:myuser frontend frontend COPY --chown=typicalc:typicalc frontend frontend
COPY --chown=myuser:myuser package.json pnpm-lock.yaml webpack.config.js ./ COPY --chown=typicalc:typicalc package.json pnpm-lock.yaml webpack.config.js ./
# Build the production package, assuming that we validated the version before so no need for running tests again # Build the production package, assuming that we validated the version before so no need for running tests again
@ -25,7 +25,7 @@ RUN mvn clean package -DskipTests -Pproduction
# Running stage: the part that is used for running the application # Running stage: the part that is used for running the application
FROM openjdk:11 FROM openjdk:11
COPY --from=build /usr/src/app/target/*.jar /usr/app/app.jar COPY --from=build /usr/src/app/target/*.jar /usr/app/app.jar
RUN useradd -m myuser RUN useradd -m typicalc
USER myuser USER typicalc
EXPOSE 8080 EXPOSE 8080
CMD java -jar /usr/app/app.jar CMD java -jar /usr/app/app.jar

14
README.md
View File

@ -53,24 +53,26 @@ More samples can be added to `src/test/resources/terms/` to speed up the process
## Deploying using Docker ## Deploying using Docker
To build the Dockerized version of the project, run To build the Dockerized version of the project, run:
``` ```
docker build . -t myapp:latest docker build . -t typicalc:latest
``` ```
Once the Docker image is correctly built, you can test it locally using Once the Docker image is correctly built, you can run it:
``` ```
docker run -p 80:8080 myapp:latest docker run -p 80:8080 typicalc:latest
``` ```
## Deploying using a JAR ## Deploying using a JAR
First build the project: First build the application:
``` ```
mvn package -Pproduction mvn clean package -Pproduction
``` ```
Then run the server: Then run the server:
``` ```
PORT=80 java -jar target/typicalc-1.0-SNAPSHOT.jar PORT=80 java -jar target/typicalc-1.0-SNAPSHOT.jar

4
src/main/java/edu/kit/typicalc/view/main/MainViewImpl.java
View File

@ -17,6 +17,7 @@ import org.apache.commons.lang3.tuple.Pair;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -99,7 +100,8 @@ public class MainViewImpl extends AppLayout
Pair.of(entry.getKey(), List.of(entry.getValue())) Pair.of(entry.getKey(), List.of(entry.getValue()))
).collect(Collectors.toMap(Pair::getLeft, Pair::getRight, ).collect(Collectors.toMap(Pair::getLeft, Pair::getRight,
(existing, replacement) -> existing, TreeMap::new))); (existing, replacement) -> existing, TreeMap::new)));
UI.getCurrent().navigate(TypeInferenceView.ROUTE + "/" + lambdaTerm, qp); UI.getCurrent().navigate(TypeInferenceView.ROUTE + "/"
+ URLEncoder.encode(lambdaTerm, StandardCharsets.UTF_8), qp);
} }
private String decodeURL(String encodedUrl) { private String decodeURL(String encodedUrl) {