LAB-linuxserver/docker-snipe-it
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-snipe-it.git synced 2026-02-20 02:30:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

arch fixes for Jenkinsfile and add port setting to readme

Browse Source
This commit is contained in:
thelamer 2018-10-11 12:45:36 -07:00
parent 5ad4f2d7e0
commit 51b409dc16
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -367,11 +367,11 @@ pipeline {
sh "docker manifest push --purge ${IMAGE}:latest || :"
sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v6-latest ${IMAGE}:arm64v8-latest"
sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v6-latest --os linux --arch arm"
sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant armv8"
sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :"
sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm"
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant armv8"
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:latest"
sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
}
@ -451,7 +451,7 @@ pipeline {
-e DOCKERHUB_USERNAME=$DOCKERUSER \
-e DOCKERHUB_PASSWORD=$DOCKERPASS \
-e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-e DOCKER_REPOSITORY=${DOCKERHUB_IMAGE} \
-e DOCKER_REPOSITORY=${IMAGE} \
-e GIT_BRANCH=master \
lsiodev/readme-sync bash -c 'node sync' '''
}

6
README.md
View File

@ -44,6 +44,7 @@ docker create \
-v <path to data>:/config \
-e APP_URL=<hostname or ip> \
-e MYSQL_PORT_3306_TCP_ADDR=<mysql host> \
-e MYSQL_PORT_3306_TCP_PORT=<mysql port> \
-e MYSQL_DATABASE=<mysql database> \
-e MYSQL_USER=<mysql user> \
-e MYSQL_PASSWORD=<mysql pass> \
@ -69,6 +70,7 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
| `-v /config` | Contains your config files and data storage for Snipe-IT|
| `-e APP_URL=` | Hostname or IP and port if applicable IE 192.168.10.1:8080 |
| `-e MYSQL_PORT_3306_TCP_ADDR=` | Mysql hostname or IP to use|
| `-e MYSQL_PORT_3306_TCP_PORT=` | Mysql port to use|
| `-e MYSQL_DATABASE=` | Mysql database to use|
| `-e MYSQL_USER=` | Mysql user to use|
| `-e MYSQL_PASSWORD=` | Mysql password to use|
@ -150,8 +152,8 @@ The architectures supported by this image are:
| Architecture | Tag |
| :----: | --- |
| X86-64 | amd64-latest |
| arm64 | arm32v6-latest |
| armhf | arm64v8-latest |
| armhf | arm32v6-latest |
| arm64 | arm64v8-latest |
You can use the "latest" tag on any architecture, the docker client will automatically pull the correct image.