Skip to content

Commit 3b34654

Browse files
GodmartinzGodmartinz
committed
Merge branch 'develop' into MS_teams_deprecation_update
# Conflicts: # resources/lang/en-US/admin/settings/message.php
2 parents 4b64378 + 9ef2099 commit 3b34654

File tree

1,481 files changed

+19795
-6862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,481 files changed

+19795
-6862
lines changed

‎.all-contributorsrc‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3316,6 +3316,69 @@
33163316
"contributions": [
33173317
"code"
33183318
]
3319+
},
3320+
{
3321+
"login": "fvollmer",
3322+
"name": "fvollmer",
3323+
"avatar_url": "https://avatars.githubusercontent.com/u/16699443?v=4",
3324+
"profile": "https://github.com/fvollmer",
3325+
"contributions": [
3326+
"code"
3327+
]
3328+
},
3329+
{
3330+
"login": "36864",
3331+
"name": "36864",
3332+
"avatar_url": "https://avatars.githubusercontent.com/u/109086466?v=4",
3333+
"profile": "https://github.com/36864",
3334+
"contributions": [
3335+
"code"
3336+
]
3337+
},
3338+
{
3339+
"login": "CloCkWeRX",
3340+
"name": "Daniel O'Connor",
3341+
"avatar_url": "https://avatars.githubusercontent.com/u/365751?v=4",
3342+
"profile": "http://clockwerx.blogspot.com/",
3343+
"contributions": [
3344+
"code"
3345+
]
3346+
},
3347+
{
3348+
"login": "BeatSpark",
3349+
"name": "BeatSpark",
3350+
"avatar_url": "https://avatars.githubusercontent.com/u/102852568?v=4",
3351+
"profile": "https://github.com/BeatSpark",
3352+
"contributions": [
3353+
"code"
3354+
]
3355+
},
3356+
{
3357+
"login": "mrdahbi",
3358+
"name": "mrdahbi",
3359+
"avatar_url": "https://avatars.githubusercontent.com/u/59203607?v=4",
3360+
"profile": "https://github.com/mrdahbi",
3361+
"contributions": [
3362+
"code"
3363+
]
3364+
},
3365+
{
3366+
"login": "chfsx",
3367+
"name": "Fabian Schmid",
3368+
"avatar_url": "https://avatars.githubusercontent.com/u/6661332?v=4",
3369+
"profile": "http://sr.solutions",
3370+
"contributions": [
3371+
"code"
3372+
]
3373+
},
3374+
{
3375+
"login": "realchrisolin",
3376+
"name": "Chris Olin",
3377+
"avatar_url": "https://avatars.githubusercontent.com/u/1288116?v=4",
3378+
"profile": "https://www.chrisolin.com",
3379+
"contributions": [
3380+
"code"
3381+
]
33193382
}
33203383
]
33213384
}

‎.env.dev.docker‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@ MAIL_BACKUP_NOTIFICATION_DRIVER=null
7979
MAIL_BACKUP_NOTIFICATION_ADDRESS=null
8080
BACKUP_ENV=true
8181

82+
# --------------------------------------------
83+
# OPTIONAL: CHANGE PHP UPLOAD LIMITS (UNCOMMENT WHEN NEEDING TO BE CHANGED)
84+
# --------------------------------------------
85+
#PHP_UPLOAD_LIMIT=10
86+
#PHP_POST_MAX_SIZE=10
87+
#PHP_UPLOAD_MAX_FILESIZE=10
88+
#PHP_MEMORY_LIMIT=10
8289

8390
# --------------------------------------------
8491
# OPTIONAL: SESSION SETTINGS

‎.env.docker‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ MAIL_BACKUP_NOTIFICATION_DRIVER=null
8484
MAIL_BACKUP_NOTIFICATION_ADDRESS=null
8585
BACKUP_ENV=true
8686

87+
# --------------------------------------------
88+
# OPTIONAL: CHANGE PHP UPLOAD LIMITS (UNCOMMENT WHEN NEEDING TO BE CHANGED)
89+
# --------------------------------------------
90+
#PHP_UPLOAD_LIMIT=10
91+
#PHP_POST_MAX_SIZE=10
92+
#PHP_UPLOAD_MAX_FILESIZE=10
93+
#PHP_MEMORY_LIMIT=10
94+
95+
8796
# --------------------------------------------
8897
# OPTIONAL: SESSION SETTINGS
8998
# --------------------------------------------

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
179179
# OPTIONAL: MISC
180180
# --------------------------------------------
181181
LOG_CHANNEL=single
182+
LOG_DEPRECATIONS=false
182183
LOG_MAX_DAYS=10
183184
APP_LOCKED=false
184185
APP_CIPHER=AES-256-CBC

‎.github/workflows/codacy-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ permissions:
2222

2323
jobs:
2424
codacy-security-scan:
25-
# Ensure schedule job never runs on forked repos. It's only executed for 'snipe/snipe-it'
25+
# Ensure schedule job never runs on forked repos. It's only executed for 'grokability/snipe-it'
2626
permissions:
2727
contents: read # for actions/checkout to fetch code
2828
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
29-
if: (github.repository == 'snipe/snipe-it') || ((github.repository != 'snipe/snipe-it') && (github.event_name != 'schedule'))
29+
if: (github.repository == 'grokability/snipe-it') || ((github.repository != 'grokability/snipe-it') && (github.event_name != 'schedule'))
3030
name: Codacy Security Scan
3131
runs-on: ubuntu-latest
3232
steps:

‎.github/workflows/docker-alpine.yml‎

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎.github/workflows/docker-arm.yml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
# Snipe-IT Docker image build for hub.docker.com
2+
name: Docker cross-platform images (Ubuntu and Alpine)
3+
4+
# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
5+
# Also run for PRs to ensure PR doesn't break Docker build process
6+
on:
7+
push:
8+
branches:
9+
- master
10+
- develop
11+
tags:
12+
- 'v**'
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
pull_request:
17+
18+
permissions:
19+
contents: read
20+
21+
jobs:
22+
docker-ubuntu:
23+
# Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
24+
if: github.repository == 'grokability/snipe-it'
25+
runs-on: ubuntu-latest
26+
env:
27+
# Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
28+
# For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
29+
# For a new commit on other branches, use the branch name as the tag for Docker image.
30+
# For a new tag, copy that tag name as the tag for Docker image.
31+
IMAGE_TAGS: |
32+
type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
33+
type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
34+
type=ref,event=tag
35+
type=semver,pattern=v{{major}}-latest
36+
# Define default tag "flavor" for docker/metadata-action per
37+
# https://github.com/docker/metadata-action#flavor-input
38+
# We turn off 'latest' tag by default.
39+
TAGS_FLAVOR: |
40+
latest=false
41+
42+
steps:
43+
# https://github.com/actions/checkout
44+
- name: Checkout codebase
45+
uses: actions/checkout@v4
46+
47+
# https://github.com/docker/setup-buildx-action
48+
- name: Setup Docker Buildx
49+
uses: docker/setup-buildx-action@v3
50+
51+
# https://github.com/docker/login-action
52+
- name: Login to DockerHub
53+
# Only login if not a PR, as PRs only trigger a Docker build and not a push
54+
if: github.event_name != 'pull_request'
55+
uses: docker/login-action@v3
56+
with:
57+
username: ${{ secrets.DOCKER_USERNAME }}
58+
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
59+
60+
###############################################
61+
# Build/Push the 'grokability/snipe-it' image
62+
###############################################
63+
# https://github.com/docker/metadata-action
64+
# Get Metadata for docker_build step below
65+
- name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
66+
id: meta_build
67+
uses: docker/metadata-action@v5
68+
with:
69+
images: grokability/snipe-it
70+
tags: ${{ env.IMAGE_TAGS }}
71+
flavor: ${{ env.TAGS_FLAVOR }}
72+
73+
# https://github.com/docker/build-push-action
74+
- name: Build and push 'snipe-it' image
75+
id: docker_build
76+
uses: docker/build-push-action@v6
77+
with:
78+
context: .
79+
file: ./Dockerfile
80+
platforms: linux/arm64,linux/amd64
81+
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
82+
# but we ONLY do an image push to DockerHub if it's NOT a PR
83+
push: ${{ github.event_name != 'pull_request' }}
84+
# Use tags / labels provided by 'docker/metadata-action' above
85+
tags: ${{ steps.meta_build.outputs.tags }}
86+
labels: ${{ steps.meta_build.outputs.labels }}
87+
docker-alpine:
88+
# Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
89+
if: github.repository == 'grokability/snipe-it'
90+
runs-on: ubuntu-latest
91+
env:
92+
# Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
93+
# For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
94+
# For a new commit on other branches, use the branch name as the tag for Docker image.
95+
# For a new tag, copy that tag name as the tag for Docker image.
96+
IMAGE_TAGS: |
97+
type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
98+
type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
99+
type=ref,event=tag,suffix=-alpine
100+
type=semver,pattern=v{{major}}-latest-alpine
101+
# Define default tag "flavor" for docker/metadata-action per
102+
# https://github.com/docker/metadata-action#flavor-input
103+
# We turn off 'latest' tag by default.
104+
TAGS_FLAVOR: |
105+
latest=false
106+
107+
steps:
108+
# https://github.com/actions/checkout
109+
- name: Checkout codebase
110+
uses: actions/checkout@v4
111+
112+
# https://github.com/docker/setup-buildx-action
113+
- name: Setup Docker Buildx
114+
uses: docker/setup-buildx-action@v3
115+
116+
# https://github.com/docker/login-action
117+
- name: Login to DockerHub
118+
# Only login if not a PR, as PRs only trigger a Docker build and not a push
119+
if: github.event_name != 'pull_request'
120+
uses: docker/login-action@v3
121+
with:
122+
username: ${{ secrets.DOCKER_USERNAME }}
123+
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
124+
125+
###############################################
126+
# Build/Push the 'grokability/snipe-it' image
127+
###############################################
128+
# https://github.com/docker/metadata-action
129+
# Get Metadata for docker_build step below
130+
- name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
131+
id: meta_build
132+
uses: docker/metadata-action@v5
133+
with:
134+
images: grokability/snipe-it
135+
tags: ${{ env.IMAGE_TAGS }}
136+
flavor: ${{ env.TAGS_FLAVOR }}
137+
138+
# https://github.com/docker/build-push-action
139+
- name: Build and push 'snipe-it' image
140+
id: docker_build
141+
uses: docker/build-push-action@v6
142+
with:
143+
context: .
144+
file: ./Dockerfile.alpine
145+
platforms: linux/arm64,linux/amd64
146+
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
147+
# but we ONLY do an image push to DockerHub if it's NOT a PR
148+
push: ${{ github.event_name != 'pull_request' }}
149+
# Use tags / labels provided by 'docker/metadata-action' above
150+
tags: ${{ steps.meta_build.outputs.tags }}
151+
labels: ${{ steps.meta_build.outputs.labels }}

0 commit comments

Comments
 (0)