Merge pull request #1 from snipe/develop

Develop

.all-contributorsrc

@@ -2478,6 +2478,42 @@
  "code"
  ]
  },
+ {
+ "login": "leitwerk-ag",
+ "name": "LEITWERK AG",
+ "avatar_url": "https://avatars.githubusercontent.com/u/24418301?v=4",
+ "profile": "https://www.leitwerk.de/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "adamboutcher",
+ "name": "Adam",
+ "avatar_url": "https://avatars.githubusercontent.com/u/1911435?v=4",
+ "profile": "http:https://www.aboutcher.co.uk",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "sneak-it",
+ "name": "Ian",
+ "avatar_url": "https://avatars.githubusercontent.com/u/16104273?v=4",
+ "profile": "https://snksrv.com",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "bestlong",
+ "name": "Shao Yu-Lung (Allen)",
+ "avatar_url": "https://avatars.githubusercontent.com/u/4023909?v=4",
+ "profile": "http:https://blog.bestlong.idv.tw/",
+ "contributions": [
+ "code"
+ ]
+ },
  {
  "login": "PlaneNuts",
  "name": "PlaneNuts",
@@ -2486,6 +2522,15 @@
  "contributions": [
  "code"
  ]
+ },
+ {
+ "login": "exula",
+ "name": "Bradley Coudriet",
+ "avatar_url": "https://avatars.githubusercontent.com/u/3842948?v=4",
+ "profile": "http:https://bjcpgd.cias.rit.edu",
+ "contributions": [
+ "code"
+ ]
  }
  ]
 }

.github/workflows/docker-alpine.yml

@@ -0,0 +1,82 @@
+# Snipe-IT (Alpine) Docker image build for hub.docker.com
+name: Docker images (Alpine)
+
+# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
+# Also run for PRs to ensure PR doesn't break Docker build process
+on:
+ push:
+ branches:
+ - master
+ - develop
+ tags:
+ - 'v**'
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+ pull_request:
+
+jobs:
+ docker:
+ # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
+ if: github.repository == 'snipe/snipe-it'
+ runs-on: ubuntu-latest
+ env:
+ # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
+ # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+ # For a new commit on other branches, use the branch name as the tag for Docker image.
+ # For a new tag, copy that tag name as the tag for Docker image.
+ IMAGE_TAGS: |
+ type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
+ type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
+ type=ref,event=tag,suffix=-alpine
+ # Define default tag "flavor" for docker/metadata-action per
+ # https://github.com/docker/metadata-action#flavor-input
+ # We turn off 'latest' tag by default.
+ TAGS_FLAVOR: |
+ latest=false
+
+ steps:
+ # https://github.com/actions/checkout
+ - name: Checkout codebase
+ uses: actions/checkout@v2
+
+ # https://github.com/docker/setup-buildx-action
+ - name: Setup Docker Buildx
+ uses: docker/setup-buildx-action@v1
+
+ # https://github.com/docker/login-action
+ - name: Login to DockerHub
+ # Only login if not a PR, as PRs only trigger a Docker build and not a push
+ if: github.event_name != 'pull_request'
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+ ###############################################
+ # Build/Push the 'snipe/snipe-it' image
+ ###############################################
+ # https://github.com/docker/metadata-action
+ # Get Metadata for docker_build step below
+ - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+ id: meta_build
+ uses: docker/metadata-action@v3
+ with:
+ images: snipe/snipe-it
+ tags: ${{ env.IMAGE_TAGS }}
+ flavor: ${{ env.TAGS_FLAVOR }}
+
+ # https://github.com/docker/build-push-action
+ - name: Build and push 'snipe-it' image
+ id: docker_build
+ uses: docker/build-push-action@v2
+ with:
+ context: .
+ file: ./Dockerfile.alpine
+ platforms: linux/amd64
+ # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+ # but we ONLY do an image push to DockerHub if it's NOT a PR
+ push: ${{ github.event_name != 'pull_request' }}
+ # Use tags / labels provided by 'docker/metadata-action' above
+ tags: ${{ steps.meta_build.outputs.tags }}
+ labels: ${{ steps.meta_build.outputs.labels }}

.github/workflows/docker.yml

@@ -0,0 +1,82 @@
+# Snipe-IT Docker image build for hub.docker.com
+name: Docker images
+
+# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
+# Also run for PRs to ensure PR doesn't break Docker build process
+on:
+ push:
+ branches:
+ - master
+ - develop
+ tags:
+ - 'v**'
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+ pull_request:
+
+jobs:
+ docker:
+ # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
+ if: github.repository == 'snipe/snipe-it'
+ runs-on: ubuntu-latest
+ env:
+ # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
+ # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+ # For a new commit on other branches, use the branch name as the tag for Docker image.
+ # For a new tag, copy that tag name as the tag for Docker image.
+ IMAGE_TAGS: |
+ type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
+ type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
+ type=ref,event=tag
+ # Define default tag "flavor" for docker/metadata-action per
+ # https://github.com/docker/metadata-action#flavor-input
+ # We turn off 'latest' tag by default.
+ TAGS_FLAVOR: |
+ latest=false
+
+ steps:
+ # https://github.com/actions/checkout
+ - name: Checkout codebase
+ uses: actions/checkout@v2
+
+ # https://github.com/docker/setup-buildx-action
+ - name: Setup Docker Buildx
+ uses: docker/setup-buildx-action@v1
+
+ # https://github.com/docker/login-action
+ - name: Login to DockerHub
+ # Only login if not a PR, as PRs only trigger a Docker build and not a push
+ if: github.event_name != 'pull_request'
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+ ###############################################
+ # Build/Push the 'snipe/snipe-it' image
+ ###############################################
+ # https://github.com/docker/metadata-action
+ # Get Metadata for docker_build step below
+ - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+ id: meta_build
+ uses: docker/metadata-action@v3
+ with:
+ images: snipe/snipe-it
+ tags: ${{ env.IMAGE_TAGS }}
+ flavor: ${{ env.TAGS_FLAVOR }}
+
+ # https://github.com/docker/build-push-action
+ - name: Build and push 'snipe-it' image
+ id: docker_build
+ uses: docker/build-push-action@v2
+ with:
+ context: .
+ file: ./Dockerfile
+ platforms: linux/amd64
+ # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+ # but we ONLY do an image push to DockerHub if it's NOT a PR
+ push: ${{ github.event_name != 'pull_request' }}
+ # Use tags / labels provided by 'docker/metadata-action' above
+ tags: ${{ steps.meta_build.outputs.tags }}
+ labels: ${{ steps.meta_build.outputs.labels }}