Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development
This commit is contained in:
anhefti
commit
902b5d88c1
3 changed files with 180 additions and 13 deletions
130
.github/workflows/buildReporting.yml
vendored
130
.github/workflows/buildReporting.yml
vendored
|
|
@ -5,27 +5,131 @@ name: build
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: [master, development]
|
||||
branches:
|
||||
- '**'
|
||||
tags:
|
||||
- '**'
|
||||
pull_request:
|
||||
branches: [master, development]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
maven-build-reporting:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up JDK 8
|
||||
-
|
||||
name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
-
|
||||
name: Set up JDK 8
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
java-version: '8'
|
||||
distribution: 'adopt'
|
||||
- name: Build with Maven
|
||||
run: mvn clean install -e -P let_reporting
|
||||
- uses: codecov/codecov-action@v1
|
||||
-
|
||||
name: Cache Maven packages
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
flags: unittests # optional
|
||||
name: SEB Server Build # optional
|
||||
fail_ci_if_error: false # optional (default = false)
|
||||
verbose: false # optional (default = false)
|
||||
path: ~/.m2
|
||||
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: ${{ runner.os }}-m2
|
||||
-
|
||||
name: Build with Maven
|
||||
run: mvn clean install -e -P let_reporting
|
||||
-
|
||||
name: Reporting
|
||||
uses: codecov/codecov-action@v1
|
||||
with:
|
||||
flags: unittests
|
||||
name: SEB Server Build
|
||||
fail_ci_if_error: false
|
||||
verbose: false
|
||||
|
||||
maven-build-docker:
|
||||
needs: maven-build-reporting
|
||||
# Run only on tagging
|
||||
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
-
|
||||
name: Get short SHA
|
||||
uses: benjlevesque/short-sha@v1.2
|
||||
id: short-sha
|
||||
-
|
||||
name: Store short SHA as environment variable
|
||||
run: echo $SHA
|
||||
env:
|
||||
SHA: ${{ steps.short-sha.outputs.sha }}
|
||||
-
|
||||
name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
-
|
||||
name: Set up JDK 11
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
java-version: '11'
|
||||
distribution: 'adopt'
|
||||
-
|
||||
name: Cache Maven packages
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: ~/.m2
|
||||
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: ${{ runner.os }}-m2
|
||||
-
|
||||
name: Build with Maven
|
||||
run: mvn clean install -Dmaven.test.skip=true -Dsebserver-version="${{ env.SHA }}"
|
||||
env:
|
||||
sebserver-version: ${{ env.SHA }}
|
||||
-
|
||||
name: Simplify package name
|
||||
run: mv target/seb-server-${{ env.SHA }}.jar target/seb-server.jar
|
||||
-
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Package
|
||||
path: target/seb-server.jar
|
||||
|
||||
docker-build:
|
||||
needs: maven-build-docker
|
||||
# Run only on tagging
|
||||
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
-
|
||||
name: Set env
|
||||
run: echo "TAG_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
|
||||
-
|
||||
name: Test
|
||||
run: |
|
||||
echo $TAG_NAME
|
||||
echo ${{ env.TAG_NAME }}
|
||||
-
|
||||
name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
-
|
||||
name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
-
|
||||
name: Login to DockerHub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
-
|
||||
name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
-
|
||||
name: Download a single artifact
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: Package
|
||||
-
|
||||
name: Build and push
|
||||
id: docker_build
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: .
|
||||
file: ./docker/Dockerfile
|
||||
push: true
|
||||
tags: |
|
||||
anhefti/seb-server:${{ env.TAG_NAME }}
|
||||
41
docker/Dockerfile
Normal file
41
docker/Dockerfile
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
FROM openjdk:11-jre-stretch
|
||||
|
||||
ENV SERVER_PORT="8080"
|
||||
ENV JMX_PORT=
|
||||
ENV JAVA_HEAP_MIN=
|
||||
ENV JAVA_HEAP_MAX=
|
||||
|
||||
#just try wihtout user to check if we habe a permission problem
|
||||
RUN groupadd --system spring && useradd --system --gid spring spring && mkdir /sebserver && chown spring:spring /sebserver
|
||||
USER spring:spring
|
||||
|
||||
COPY docker/start-sebserver.sh seb-server.jar /sebserver/
|
||||
|
||||
WORKDIR /sebserver
|
||||
|
||||
# NOTE: This seems not to work, maybe some permission problems, how knows!?
|
||||
#CMD /bin/sh /sebserver/start-sebserver.sh
|
||||
|
||||
CMD if [ "x${JMX_PORT}" = "x" ] ; \
|
||||
then exec java \
|
||||
-Xms${JAVA_HEAP_MIN} \
|
||||
-Xmx${JAVA_HEAP_MAX} \
|
||||
-jar "seb-server.jar" \
|
||||
--spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
|
||||
else echo "admin ${SEBSERVER_SECRET}" > jmxremote.password && chown spring:spring /sebserver/jmxremote.password && chmod 400 /sebserver/jmxremote.password && exec java \
|
||||
-Xms${JAVA_HEAP_MIN} \
|
||||
-Xmx${JAVA_HEAP_MAX} \
|
||||
-Dcom.sun.management.jmxremote \
|
||||
-Dcom.sun.management.jmxremote.port=${JMX_PORT} \
|
||||
-Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT} \
|
||||
-Djava.rmi.server.hostname=localhost \
|
||||
-Dcom.sun.management.jmxremote.local.only=false \
|
||||
-Dcom.sun.management.jmxremote.ssl=false \
|
||||
-Dcom.sun.management.jmxremote.authenticate=true \
|
||||
-Dcom.sun.management.jmxremote.password.file=/sebserver/jmxremote.password \
|
||||
-Dcom.sun.management.jmxremote.access.file=/sebserver/config/jmx/jmxremote.access \
|
||||
-jar "seb-server.jar" \
|
||||
--spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
|
||||
fi
|
||||
|
||||
EXPOSE $SERVER_PORT $JMX_PORT
|
||||
22
docker/start-sebserver.sh
Normal file
22
docker/start-sebserver.sh
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
#!/bin/sh
|
||||
if [ "x${JMX_PORT}" = "x" ] ; \
|
||||
then exec java \
|
||||
-Xms${JAVA_HEAP_MIN} \
|
||||
-Xmx${JAVA_HEAP_MAX} \
|
||||
-jar "seb-server.jar" \
|
||||
--spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
|
||||
else echo "admin ${SEBSERVER_SECRET}" > jmxremote.password && chown spring:spring /sebserver/jmxremote.password && chmod 400 /sebserver/jmxremote.password && exec java \
|
||||
-Xms${JAVA_HEAP_MIN} \
|
||||
-Xmx${JAVA_HEAP_MAX} \
|
||||
-Dcom.sun.management.jmxremote \
|
||||
-Dcom.sun.management.jmxremote.port=${JMX_PORT} \
|
||||
-Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT} \
|
||||
-Djava.rmi.server.hostname=localhost \
|
||||
-Dcom.sun.management.jmxremote.local.only=false \
|
||||
-Dcom.sun.management.jmxremote.ssl=false \
|
||||
-Dcom.sun.management.jmxremote.authenticate=true \
|
||||
-Dcom.sun.management.jmxremote.password.file=/sebserver/jmxremote.password \
|
||||
-Dcom.sun.management.jmxremote.access.file=/sebserver/config/jmx/jmxremote.access \
|
||||
-jar "seb-server.jar" \
|
||||
--spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
|
||||
fi
|
||||
Loading…
Reference in a new issue