You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openserverless.apache.org by fr...@apache.org on 2024/08/06 13:40:55 UTC
(openserverless-operator) 23/24: chore: aligning tag version in build process
This is an automated email from the ASF dual-hosted git repository.
franztt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless-operator.git
commit 1757d7153682b9d355b72b3c829aaad152aef7e8
Author: francescotimperi <fr...@gmail.com>
AuthorDate: Sat Jul 27 16:00:18 2024 +0000
chore: aligning tag version in build process
---
.github/workflows/image.yml | 6 +++++-
Dockerfile | 4 ++--
Taskfile.yml | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 60c2732..a544774 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -62,7 +62,11 @@ jobs:
- name: Assign TAG from push
if: ${{ github.event_name != 'pull_request' }}
run: |
- echo "IMG_TAG=$(git describe --tags --abbrev=0)" >> "$GITHUB_ENV"
+ echo "IMG_TAG=$(git describe --tags --abbrev=0)" >> "$GITHUB_ENV"
+ - name: Assign Custom Image Name
+ if: ${{ github.repository_owner != 'apache'}}
+ run: |
+ echo "MY_OPERATOR_IMAGE=${{ vars.MY_OPERATOR_IMAGE }}" >> "$GITHUB_ENV"
- name: Registry login
uses: docker/login-action@v3
with:
diff --git a/Dockerfile b/Dockerfile
index 92ecf70..5ba6731 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,8 +20,8 @@ ENV CONTROLLER_IMAGE=ghcr.io/nuvolaris/openwhisk-controller
ENV CONTROLLER_TAG=3.1.0-mastrogpt.2402101445
ENV INVOKER_IMAGE=ghcr.io/nuvolaris/openwhisk-invoker
ENV INVOKER_TAG=3.1.0-mastrogpt.2402101445
-ARG OPERATOR_IMAGE_DEFAULT=registry.hub.docker.com/apacheopenserverless/openserverless-operator
-ARG OPERATOR_TAG_DEFAULT=0.1-snapshot.2309191654
+ARG OPERATOR_IMAGE_DEFAULT=registry.hub.docker.com/apache/openserverless-operator
+ARG OPERATOR_TAG_DEFAULT=0.1.0-testing.2309191654
ENV OPERATOR_IMAGE=${OPERATOR_IMAGE_DEFAULT}
ENV OPERATOR_TAG=${OPERATOR_TAG_DEFAULT}
diff --git a/Taskfile.yml b/Taskfile.yml
index 5d4ed56..e8c91a9 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -22,7 +22,7 @@ vars:
N: ""
T: ""
P: ""
- BASETAG: 0.1-snapshot
+ BASETAG: 0.1.0-testing
KUBE:
sh: ./detect.sh
NS: "nuvolaris"