From 7c961a85255a56b121ac77a7252b11e6c061ee95 Mon Sep 17 00:00:00 2001 From: Rafael Breno <32229014+rafaelbreno@users.noreply.github.com> Date: Wed, 11 Sep 2024 23:36:45 -0300 Subject: [PATCH] Add test --- .github/workflows/image-push.yml | 27 +++++++++------------------ Makefile | 2 +- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/image-push.yml b/.github/workflows/image-push.yml index bfbe54f..06bff6f 100644 --- a/.github/workflows/image-push.yml +++ b/.github/workflows/image-push.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: get the build-args values id: get-build-args @@ -23,34 +23,25 @@ jobs: echo "$(make -s log | grep TAG)" >> "$GITHUB_ENV" echo "$(make -s log | grep GOLANG_VERSION)" >> "$GITHUB_ENV" - - name: "Read secrets" - uses: rancher-eio/read-vault-secrets@main - with: - secrets: | - secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials username | DOCKER_USERNAME ; - secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials password | DOCKER_PASSWORD + #- name: "Read secrets" + #uses: rancher-eio/read-vault-secrets@main + #with: + #secrets: | + #secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials username | DOCKER_USERNAME ; + #secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials password | DOCKER_PASSWORD - name: Login to Container Registry uses: docker/login-action@v3 with: - username: ${{ env.DOCKER_USERNAME }} - password: ${{ env.DOCKER_PASSWORD }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_SECRET }} - name: Build and push image uses: rancher/ecm-distro-tools/actions/publish-image@master with: image: hardened-kubernetes tag: ${{ github.event.release.tag_name }} - context: . public-repo: rancher public-username: ${{ env.DOCKER_USERNAME }} public-password: ${{ env.DOCKER_PASSWORD }} push-to-prime: false - - push: true - tags: rancher/hardened-kubernetes:${{ github.event.release.tag_name }} - file: Dockerfile - platforms: linux/amd64,linux/arm64 - build-args: | - TAG=${{ env.TAG }} - GO_IMAGE=rancher/hardened-build-base:${{ env.GOLANG_VERSION }} diff --git a/Makefile b/Makefile index 3b29cb3..89d732e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SEVERITIES = HIGH,CRITICAL UNAME_M = $(shell uname -m) -ORG ?= rancher +ORG ?= rafiusky PKG ?= github.com/kubernetes/kubernetes SRC ?= github.com/kubernetes/kubernetes TAG ?= ${GITHUB_ACTION_TAG}