Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/action_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
with:
enabled: true
can_deploy: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-') }}
name: ${{ needs.params.outputs.name }}
matrix: ${{ needs.params.outputs.matrix }}
refs: ${{ needs.params.outputs.refs }}
secrets:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/action_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
with:
enabled: true
can_deploy: false
name: ${{ needs.params.outputs.name }}
matrix: ${{ needs.params.outputs.matrix }}
refs: ${{ needs.params.outputs.refs }}
secrets:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/action_schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
with:
enabled: true
can_deploy: true
name: ${{ needs.params.outputs.name }}
matrix: ${{ needs.params.outputs.matrix }}
refs: ${{ needs.params.outputs.refs }}
secrets:
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/params.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ name: params
# Custom Variables
# -------------------------------------------------------------------------------------------------
env:
NAME: Nginx
MATRIX: >-
[
{
"NAME": "Nginx",
"VERSION": ["stable"],
"ARCH": ["linux/amd64", "linux/386", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]

}
]

Expand All @@ -28,9 +26,6 @@ env:
on:
workflow_call:
outputs:
name:
description: "The project name"
value: ${{ jobs.params.outputs.name }}
matrix:
description: "The determined version matrix"
value: ${{ jobs.params.outputs.matrix }}
Expand All @@ -43,16 +38,10 @@ jobs:
runs-on: ubuntu-latest

outputs:
name: ${{ steps.set-name.outputs.name }}
matrix: ${{ steps.set-matrix.outputs.matrix }}
refs: ${{ steps.set-refs.outputs.matrix }}

steps:
- name: "Set Name"
id: set-name
run: |
echo '::set-output name=name::${{ env.NAME }}'

- name: "[Set-Output] Matrix"
id: set-matrix
run: |
Expand All @@ -69,11 +58,6 @@ jobs:

- name: "[DEBUG] Show settings'"
run: |
echo 'Name'
echo '--------------------'
echo '${{ steps.set-name.outputs.name }}'
echo

echo 'Matrix'
echo '--------------------'
echo '${{ steps.set-matrix.outputs.matrix }}'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TAG = latest
# Makefile.docker overwrites
NAME = Nginx
VERSION = stable
IMAGE = devilbox/nginx-stable
IMAGE = devilbox/nginx-$(VERSION)
DIR = .
FILE = Dockerfile
DOCKER_TAG = $(TAG)
Expand Down