Skip to content

Commit ff4ee77

Browse files
authored
Merge pull request #20 from blendededge/bugfix/ferryman-version
Reverted changes to master.yml to see if that caused the docker image…
2 parents e9ccfdd + 486827d commit ff4ee77

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

.github/workflows/master.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
# Triggers the workflow on push or pull request events but only for the master branch
66
push:
77
branches: [ master ]
8-
tags: ['v*.*.*']
98
pull_request:
109
branches: [ master ]
1110

@@ -24,23 +23,6 @@ jobs:
2423
- name: Check Out Repo
2524
uses: actions/checkout@v2
2625

27-
- name: Docker meta
28-
id: meta
29-
uses: docker/metadata-action@v3
30-
with:
31-
# list of Docker images to use as base name for tags
32-
images: |
33-
${{ secrets.DOCKER_REPO_PATH }}/rest-api-component-oih
34-
# generate Docker tags based on the following events/attributes
35-
tags: |
36-
type=schedule
37-
type=ref,event=branch
38-
type=ref,event=pr
39-
type=semver,pattern={{version}}
40-
type=semver,pattern={{major}}.{{minor}}
41-
type=semver,pattern={{major}}
42-
type=sha
43-
4426
- name: Set up Docker Buildx
4527
id: buildx
4628
uses: docker/setup-buildx-action@v1
@@ -67,8 +49,7 @@ jobs:
6749
builder: ${{ steps.buildx.outputs.name }}
6850
file: ./Dockerfile
6951
push: ${{ github.event_name != 'pull_request' }}
70-
tags: ${{ steps.meta.outputs.tags }}
71-
labels: ${{ steps.meta.outputs.labels }}
52+
tags: ${{ secrets.DOCKER_REPO_PATH }}/rest-api-component-oih:latest
7253
cache-from: type=local,src=/tmp/.buildx-cache
7354
cache-to: type=local,dest=/tmp/.buildx-cache-new
7455

@@ -82,4 +63,4 @@ jobs:
8263
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
8364
8465
- name: Image digest
85-
run: echo ${{ steps.docker_build.outputs.digest }}
66+
run: echo ${{ steps.docker_build.outputs.digest }}

0 commit comments

Comments
 (0)