From 621f64c3639a4ac7ac9ae2caa509c76faca3706f Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 15:25:50 +0300 Subject: [PATCH 01/10] fix image name --- .github/workflows/build_dev.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 5ae89641..580826b4 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -38,3 +38,20 @@ jobs: with: name: kubescape-${{ matrix.os }} path: build/${{ matrix.os }}/kubescape + + steps: + - uses: actions/checkout@v2 + + - name: Set name + run: echo quay.io/avnertzurarmo/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt + + - name: Build the Docker image + run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) + + - name: Login ot Quay.io + env: # Or as an environment variable + QUAY_PASSWORD: ${{ secrets.QUAYIO_REGISTRY_PASSWORD }} + QUAY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }} + run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io + - name: Push Docker image + run: docker push $(cat build_tag.txt) \ No newline at end of file From 82994ce7548c9ff7d0939fe34c28d110ce47ddc8 Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 15:43:38 +0300 Subject: [PATCH 02/10] fix typo --- .github/workflows/build_dev.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 580826b4..e96bfdcb 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -39,11 +39,17 @@ jobs: name: kubescape-${{ matrix.os }} path: build/${{ matrix.os }}/kubescape + + build-docker: + name: Build docker container, tag and upload to registry + needs: build + runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - name: Set name - run: echo quay.io/avnertzurarmo/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt + run: echo quay.io/armosec/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt - name: Build the Docker image run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) @@ -54,4 +60,5 @@ jobs: QUAY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }} run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io - name: Push Docker image - run: docker push $(cat build_tag.txt) \ No newline at end of file + run: docker push $(cat build_tag.txt) + \ No newline at end of file From 37c429b264166a99d4d1815a0090973c464d9eb5 Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 15:55:06 +0300 Subject: [PATCH 03/10] add Docker container build --- .github/workflows/build_dev.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index e96bfdcb..bea5b429 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -53,6 +53,9 @@ jobs: - name: Build the Docker image run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) + + - name: re-tag Image to latest + run: docker tag $(cat build_tag.txt) quay.io/armosec/kubescape:latest - name: Login ot Quay.io env: # Or as an environment variable @@ -60,5 +63,7 @@ jobs: QUAY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }} run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io - name: Push Docker image - run: docker push $(cat build_tag.txt) + run: | + docker push $(cat build_tag.txt) + docker push quay.io/armosec/kubescape:latest \ No newline at end of file From 2c44c0e1f0605c25384b3521f2c063df64e8eabb Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 15:59:47 +0300 Subject: [PATCH 04/10] fix Docker build and tags --- .github/workflows/build.yaml | 29 +++++++++++++++++++++++++++++ .github/workflows/build_dev.yaml | 4 ---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c39f20ef..a207781d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -57,3 +57,32 @@ jobs: asset_path: build/${{ matrix.os }}/kubescape asset_name: kubescape-${{ matrix.os }} asset_content_type: application/octet-stream + + + build-docker: + name: Build docker container, tag and upload to registry + needs: build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set name + run: echo quay.io/armosec/kubescape:v1.0.${{ github.run_number }} > build_tag.txt + + - name: Build the Docker image + run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) + + - name: Re-Tag Image to latest + run: docker tag $(cat build_tag.txt) quay.io/armosec/kubescape:latest + + - name: Login ot Quay.io + env: # Or as an environment variable + QUAY_PASSWORD: ${{ secrets.QUAYIO_REGISTRY_PASSWORD }} + QUAY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }} + run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io + - name: Push Docker image + run: | + docker push $(cat build_tag.txt) + docker push quay.io/armosec/kubescape:latest + \ No newline at end of file diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index bea5b429..0191a002 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -54,9 +54,6 @@ jobs: - name: Build the Docker image run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) - - name: re-tag Image to latest - run: docker tag $(cat build_tag.txt) quay.io/armosec/kubescape:latest - - name: Login ot Quay.io env: # Or as an environment variable QUAY_PASSWORD: ${{ secrets.QUAYIO_REGISTRY_PASSWORD }} @@ -65,5 +62,4 @@ jobs: - name: Push Docker image run: | docker push $(cat build_tag.txt) - docker push quay.io/armosec/kubescape:latest \ No newline at end of file From b1f5cd45c4446368bb4cd8533e444c30bb5ed6a9 Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 16:13:54 +0300 Subject: [PATCH 05/10] use repo as secret --- .github/workflows/build_dev.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 0191a002..3a66dfe1 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -49,7 +49,9 @@ jobs: - uses: actions/checkout@v2 - name: Set name - run: echo quay.io/armosec/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt + env: + QUAY_REPO: ${{ secrets.QUAYIO_REPO }} + run: echo quay.io/${QUAY_REPO}/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt - name: Build the Docker image run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) From a06d11dc178f594b1e9c78c75a069aef1402ea54 Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 16:38:00 +0300 Subject: [PATCH 06/10] fix repo env usage --- .github/workflows/build_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 3a66dfe1..d5f66162 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -51,7 +51,7 @@ jobs: - name: Set name env: QUAY_REPO: ${{ secrets.QUAYIO_REPO }} - run: echo quay.io/${QUAY_REPO}/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt + run: echo quay.io/$QUAY_REPO/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt - name: Build the Docker image run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) From b876cd0975e6ded04510fcb9490d765a1cae79b2 Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 16:49:01 +0300 Subject: [PATCH 07/10] use armosec repo name --- .github/workflows/build_dev.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index d5f66162..4d38b20b 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -50,8 +50,7 @@ jobs: - name: Set name env: - QUAY_REPO: ${{ secrets.QUAYIO_REPO }} - run: echo quay.io/$QUAY_REPO/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt + run: echo quay.io/armosec/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt - name: Build the Docker image run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) From 1dcde1538e828291167aeb8695948d3da5e3e455 Mon Sep 17 00:00:00 2001 From: Avner Tzur Date: Sun, 17 Oct 2021 16:50:59 +0300 Subject: [PATCH 08/10] fix typo --- .github/workflows/build_dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 4d38b20b..0191a002 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -49,7 +49,6 @@ jobs: - uses: actions/checkout@v2 - name: Set name - env: run: echo quay.io/armosec/kubescape:dev-v1.0.${{ github.run_number }} > build_tag.txt - name: Build the Docker image From 829e7a33aa186602750fd49df043869bb603a812 Mon Sep 17 00:00:00 2001 From: Avner Tzur <78496046+AvnerTzurArmo@users.noreply.github.com> Date: Mon, 18 Oct 2021 08:25:25 +0300 Subject: [PATCH 09/10] fix typo --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a207781d..480a3f5d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -76,7 +76,7 @@ jobs: - name: Re-Tag Image to latest run: docker tag $(cat build_tag.txt) quay.io/armosec/kubescape:latest - - name: Login ot Quay.io + - name: Login to Quay.io env: # Or as an environment variable QUAY_PASSWORD: ${{ secrets.QUAYIO_REGISTRY_PASSWORD }} QUAY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }} @@ -85,4 +85,4 @@ jobs: run: | docker push $(cat build_tag.txt) docker push quay.io/armosec/kubescape:latest - \ No newline at end of file + From 88d83ba72d8547b9ef61ce975dc7d5ef4522e224 Mon Sep 17 00:00:00 2001 From: Avner Tzur <78496046+AvnerTzurArmo@users.noreply.github.com> Date: Mon, 18 Oct 2021 08:26:15 +0300 Subject: [PATCH 10/10] fix typo --- .github/workflows/build_dev.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 0191a002..a5fb41a9 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -54,12 +54,14 @@ jobs: - name: Build the Docker image run: docker build . --file build/Dockerfile --tag $(cat build_tag.txt) - - name: Login ot Quay.io + - name: Login to Quay.io env: # Or as an environment variable QUAY_PASSWORD: ${{ secrets.QUAYIO_REGISTRY_PASSWORD }} QUAY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }} run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io + - name: Push Docker image run: | docker push $(cat build_tag.txt) - \ No newline at end of file + +