diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml index fd5bdfe1..a674a2b8 100644 --- a/.github/workflows/build_docker_images.yml +++ b/.github/workflows/build_docker_images.yml @@ -1,10 +1,31 @@ -name: ci +services: + mysql: + image: mysql:8 + env: + MYSQL_ROOT_PASSWORD: somePW + MYSQL_ALLOW_EMPTY_PASSWORD: yes + +name: latest on: push: branches: master jobs: + # test: + # runs-on: ubuntu-latest + # steps: + # - name: Checkout repository + # uses: actions/checkout@v2 + # - name: Set up JDK11 + # uses: actions/setup-java@v1 + # with: + # java-version: 11 + # - name: Run tests + # run: mvn clean test + # env: + # SERVER_PWD: somePW + build: runs-on: ubuntu-latest steps: @@ -21,11 +42,12 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Build with maven - run: mvn clean package -DskipTests -Dbuild-version="auto" + run: mvn clean package -DskipTests -Dbuild-version="demo" - uses: actions/upload-artifact@v2 with: name: Package - path: target/seb-server-auto.jar + path: target/seb-server-demo.jar + docker_push: runs-on: ubuntu-latest @@ -58,7 +80,7 @@ jobs: context: . file: ./docker/demo/Dockerfile push: true - tags: bengig/seb-server:latest + tags: bengig/seb-server:demo - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/docker/demo/Dockerfile b/docker/demo/Dockerfile index 73d9c731..f1c0d646 100644 --- a/docker/demo/Dockerfile +++ b/docker/demo/Dockerfile @@ -1,11 +1,12 @@ FROM openjdk:11-jre-stretch -ENV SEBSERVER_JAR=auto +ENV SEBSERVER_JAR=demo ENV SERVER_PORT="8080" ENV JMX_PORT="9090" -ENV SERVER_PWD= +ENV SERVER_PWD=demo_pwd COPY seb-server-$SEBSERVER_JAR.jar /sebserver/seb-server-$SEBSERVER_JAR.jar +COPY docker/demo/config/ /sebserver/config/ ENTRYPOINT exec java \ -Dcom.sun.management.jmxremote \ diff --git a/docker/demo/config/application-demo.properties b/docker/demo/config/application-demo.properties index ecfd8cc0..4f141455 100644 --- a/docker/demo/config/application-demo.properties +++ b/docker/demo/config/application-demo.properties @@ -13,6 +13,7 @@ server.servlet.context-path=/ logging.level.ROOT=WARN logging.level.ch=DEBUG # Log file name and location +# TODO: logging should go to stdout logging.file=/sebserver/log/sebserver.log ##########################################################