diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index bbacd1ef..eac03187 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -60,7 +60,8 @@ jobs: - name: Build and stage awx-operator working-directory: awx-operator run: | - BUILD_ARGS="--build-arg DEFAULT_AWX_VERSION=${{ github.event.inputs.default_awx_version }}" \ + BUILD_ARGS="--build-arg DEFAULT_AWX_VERSION=${{ github.event.inputs.default_awx_version }} \ + --build-arg OPERATOR_VERSION=${{ github.event.inputs.version }}" \ IMAGE_TAG_BASE=ghcr.io/${{ github.repository_owner }}/awx-operator \ VERSION=${{ github.event.inputs.version }} make docker-build docker-push diff --git a/Dockerfile b/Dockerfile index 1db8fdaa..e928702e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ FROM quay.io/operator-framework/ansible-operator:v1.12.0 ARG DEFAULT_AWX_VERSION +ARG OPERATOR_VERSION ENV DEFAULT_AWX_VERSION=${DEFAULT_AWX_VERSION} +ENV OPERATOR_VERSION=${OPERATOR_VERSION} COPY requirements.yml ${HOME}/requirements.yml RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \