Skip to content

Commit

Permalink
try again
Browse files Browse the repository at this point in the history
  • Loading branch information
Bogdan Peter committed Jul 6, 2024
1 parent f9da2a9 commit 9d3de7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
9 changes: 1 addition & 8 deletions .github/actions/build/docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@ runs:
osctrl-${{ inputs.osctrl_component }}-${{ inputs.commit_sha }}-${{ inputs.go_os }}-${{ inputs.go_arch }}.bin \
osctrl-${{ inputs.osctrl_component }}-${{ inputs.go_os }}-${{ inputs.go_arch }}.bin
########################### Add meta data ###########################
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}

########################### Log into Dockerhub ###########################
- name: Login to Docker Hub
uses: docker/[email protected]
Expand All @@ -84,7 +77,7 @@ runs:
context: .
file: ./deploy/cicd/docker/Dockerfile-osctrl-${{ inputs.osctrl_component }}
push: true
# tags: ${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}:${{ inputs.docker_tag }}
tags: ${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}:${{ inputs.docker_tag }}
platforms: "${{ inputs.go_os }}/${{ inputs.go_arch }}"
outputs: type=image,name=osctrl-${{ inputs.osctrl_component }},push-by-digest=true,name-canonical=true,push=true
build-args: |
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/build_and_test_main_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,9 @@ jobs:
- name: Set up Docker Buildx
uses: docker/[email protected]

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ matrix.image }}

########################### Log into Dockerhub ###########################
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3.0.0
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
Expand Down

0 comments on commit 9d3de7f

Please sign in to comment.