Trez/docker-mods-uptime-kuma-timeout-fix
4
0
Fork 0
mirror of https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git synced 2026-07-19 09:53:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Corrected after rebaseline error

Browse Source
This commit is contained in:
TheCaptain989
2020-10-31 16:38:12 -05:00
parent d48a9fa820
commit 0062aecd54
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/BuildImage.yml
-13
View File
@@ -6,13 +6,8 @@ jobs:
build: build:
env: env:
DOCKERHUB: "linuxserver/mods" #don't modify DOCKERHUB: "linuxserver/mods" #don't modify
<<<<<<< HEAD
BASEIMAGE: "baseimagename" #replace
MODNAME: "modname" #replace
=======
BASEIMAGE: "lidarr" #replace BASEIMAGE: "lidarr" #replace
MODNAME: "flac2mp3" #replace MODNAME: "flac2mp3" #replace
>>>>>>> 38e21e1... Initial release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@@ -22,10 +17,6 @@ jobs:
id: build id: build
run: | run: |
docker build --no-cache -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} . docker build --no-cache -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} .
<<<<<<< HEAD
=======
>>>>>>> 38e21e1... Initial release
- name: Push image - name: Push image
if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }} if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
run: | run: |
@@ -35,8 +26,4 @@ jobs:
echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin
# Push all of the tags # Push all of the tags
docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
<<<<<<< HEAD
docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}
=======
docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}
>>>>>>> 38e21e1... Initial release