Skip to content

Commit

Permalink
Merge pull request #5 from rwth-acis/develop
Browse files Browse the repository at this point in the history
Gradle, las2peer v1.1.1 and Java 14
  • Loading branch information
pedela authored Feb 23, 2021
2 parents 87a92cb + 345106c commit 3e1f343
Show file tree
Hide file tree
Showing 45 changed files with 580 additions and 486 deletions.
13 changes: 0 additions & 13 deletions .classpath

This file was deleted.

12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/output/
/export/
/project_management_service/output/
/project_management_service/export/
/node-storage/
/.las2peer/
/tmp/
/log/
/project_management_service/log/
/lib/
/etc/ivy/ivy.jar
/service/
Expand All @@ -18,3 +20,11 @@
/etc/startup/
*.secret
archiva_credentials.xml
.project
.classpath

# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build
17 changes: 0 additions & 17 deletions .project

This file was deleted.

9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM openjdk:8-jdk-alpine
FROM openjdk:14-jdk-alpine

ENV HTTP_PORT=8080
ENV HTTPS_PORT=8443
ENV LAS2PEER_PORT=9011

RUN apk add --update bash mysql-client apache-ant && rm -f /var/cache/apk/*
RUN apk add --update bash mysql-client && rm -f /var/cache/apk/*
RUN addgroup -g 1000 -S las2peer && \
adduser -u 1000 -S las2peer -G las2peer

Expand All @@ -13,7 +13,7 @@ WORKDIR /src

# run the rest as unprivileged user
USER las2peer
RUN ant jar
RUN chmod +x gradlew && ./gradlew build --exclude-task test

EXPOSE $HTTP_PORT
EXPOSE $HTTPS_PORT
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This includes creating projects and managing their components, users and roles.


## How to build this service
Building the service is just building a las2peer service. The [las2peer template project](https://github.com/rwth-acis/las2peer-Template-Project) and its wiki contain detailed information, but basically you should be able to clone the repository and execute a build using ant.
Building the service is just building a las2peer service. The [las2peer template project](https://github.com/rwth-acis/las2peer-Template-Project) and its wiki contain detailed information, but basically you should be able to clone the repository and execute a build using gradle.

## How to run using Docker

Expand Down
Loading

0 comments on commit 3e1f343

Please sign in to comment.