Merge pull request #52 from Edirom/dev

Version 0.6.0

.github/workflows/maven_docker.yml

@@ -0,0 +1,90 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: maven and docker
+on:
+  push:
+    branches: [ main, dev ]
+    tags:     [ v* ]
+  pull_request:
+    branches: [ main, dev ]
+jobs:
+  build:
+    name: compile maven package
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: maven-settings
+      uses: s4u/maven-settings-action@v2
+      with:
+        servers: '[{"id": "edirom", "username": "${github.actor}", "password": "${GITHUB_TOKEN}"},{"id": "teic", "username": "${github.actor}", "password": "${GITHUB_TOKEN}"}]'
+    - name: Build with Maven
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: mvn clean package --file pom.xml
+    - name: Upload Maven build artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: artifact
+        path: /home/runner/work/MEIGarage/MEIGarage/target/meigarage.war
+  docker:
+    name: build the Docker image
+    needs: build
+    runs-on: ubuntu-latest
+    #don't run docker build on pull request at all
+    if: ${{ github.event_name != 'pull_request' }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: artifact/
+
+      # use the current user to log into the 
+      # GitHub container registry 
+      - name: Log in to GitHub Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Login against DockerHub registry
+      - name: Log in to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: vifebot
+          password: ${{ secrets.VIFEBOT_DOCKERHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ghcr.io/edirom/meigarage
+            edirom/meigarage
+          flavor: |
+            latest=${{ github.ref == 'refs/heads/main' }}
+            
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BUILDTYPE=github

.gitignore

@@ -1,5 +1,8 @@
 *
 !*/
+.idea/
+!src/main/webapp/*
+!src/main/webapp/Info/*
 !.gitignore
 !*.gitattributes
 !pom.xml
@@ -20,3 +23,6 @@ target/
 !.dockerignore
 !docker-entrypoint.sh
 !Dockerfile
+!doc/*.xsl
+!doc/*.html
+

CITATION.cff

@@ -0,0 +1,33 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+authors:
+- family-names: "Parkoła"
+  given-names: "Tomasz"
+- family-names: "Stanisławczyk"
+  given-names: "Mariusz"
+- family-names: "Cummings"
+  given-names: "James"
+- family-names: "Burnard"
+  given-names: "Lou"
+- family-names: "Rahtz"
+  given-names: "Sebastian"  
+- family-names: "Werla"
+  given-names: "Marcin"  
+- family-names: "Mittelbach"
+  given-names: "Arno"
+- family-names: "Cayless"
+  given-names: "Hugh"
+- family-names: "Viglianti"
+  given-names: "Raffaele"
+- family-names: "Röwenstrunk"
+  given-names: "Daniel"
+- family-names: "Stadler"
+  given-names: "Peter"
+- family-names: "Ferger"
+  given-names: "Anne"
+title: "MEIGarage"
+version: 0.5.2
+doi: 
+date-released: 2022-09-08
+url: "https://github.com/Edirom/MEIGarage"