diff --git a/Makefile b/Makefile index 92a38bc25..fbdf3f583 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 0.6.4 +VERSION ?= 0.6.5 CONTAINER_MANAGER ?= podman # Image URL to use all building/pushing image targets IMG ?= quay.io/rhqp/qenvs:v${VERSION} diff --git a/oci/Containerfile b/oci/Containerfile index 6a7e46c4b..a8ed7a82a 100644 --- a/oci/Containerfile +++ b/oci/Containerfile @@ -1,4 +1,3 @@ - FROM registry.access.redhat.com/ubi9/go-toolset:1.21.9-1.1717085562@sha256:d1911ff6e8b3d17175dafe00aa466e83c3ceec45903b01a7cc18e9e417781263 as builder USER root @@ -6,11 +5,7 @@ WORKDIR /workspace COPY . . # renovate: datasource=github-releases depName=pulumi/pulumi -<<<<<<< HEAD -ENV PULUMI_VERSION 3.94.2 -======= ENV PULUMI_VERSION 3.116.1 ->>>>>>> 0868070 (chore: upgrade deps) ENV PULUMI_URL https://github.com/pulumi/pulumi/releases/download/v${PULUMI_VERSION}/pulumi-v${PULUMI_VERSION}-linux-x64.tar.gz RUN make build \ @@ -29,58 +24,25 @@ ENV INTERNAL_OUTPUT=/tmp/qenvs \ VOLUME [ "${INTERNAL_OUTPUT}" ] -<<<<<<< HEAD -ENV AWS_CLI_VERSION 2.13.36 -ENV AWS_CLI_URL https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip - -ENV AZ_CLI_VERSION 2.54.0 -======= ENV AWS_CLI_VERSION 2.15.55 ENV AWS_CLI_URL https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip ENV AZ_CLI_VERSION 2.61.0 ->>>>>>> 0868070 (chore: upgrade deps) ENV AZ_CLI_RPM https://packages.microsoft.com/rhel/9.0/prod/Packages/a/azure-cli-${AZ_CLI_VERSION}-1.el9.x86_64.rpm # Pulumi plugins # renovate: datasource=github-releases depName=pulumi/pulumi-aws -<<<<<<< HEAD -<<<<<<< HEAD -ARG PULUMI_AWS_VERSION=v6.12.1 -# renovate: datasource=github-releases depName=pulumi/pulumi-aws -ARG PULUMI_AWSX_VERSION=v2.3.0 -# renovate: datasource=github-releases depName=pulumi/pulumi-azure-native -ARG PULUMI_AZURE_NATIVE_VERSION=v2.20.0 -======= -ARG PULUMI_AWS_VERSION=v6.37.0 -======= ARG PULUMI_AWS_VERSION=v6.37.1 ->>>>>>> bf4b70f (fix(deps): update patch updates to v6.37.1) # renovate: datasource=github-releases depName=pulumi/pulumi-aws ARG PULUMI_AWSX_VERSION=v2.3.0 # renovate: datasource=github-releases depName=pulumi/pulumi-azure-native ARG PULUMI_AZURE_NATIVE_VERSION=v2.42.1 ->>>>>>> 0868070 (chore: upgrade deps) # renovate: datasource=github-releases depName=pulumi/pulumi-command ARG PULUMI_COMMAND_VERSION=v0.11.1 # renovate: datasource=github-releases depName=pulumi/pulumi-tls -<<<<<<< HEAD -ARG PULUMI_TLS_VERSION=v4.11.1 -# renovate: datasource=github-releases depName=pulumi/pulumi-random -<<<<<<< HEAD -ARG PULUMI_RANDOM_VERSION=v4.14.0 -======= -ARG PULUMI_RANDOM_VERSION=v4.16.0 ->>>>>>> 0868070 (chore: upgrade deps) -======= ARG PULUMI_TLS_VERSION=v5.0.3 # renovate: datasource=github-releases depName=pulumi/pulumi-random -<<<<<<< HEAD -ARG PULUMI_RANDOM_VERSION=v4.16.1 ->>>>>>> 1b21c01 (chore(deps): update patch updates) -======= ARG PULUMI_RANDOM_VERSION=v4.16.2 ->>>>>>> 8e8c4a3 (fix(deps): update patch updates to v4.16.2) RUN curl ${AWS_CLI_URL} -o awscliv2.zip \ && dnf install -y unzip \ diff --git a/tkn/infra-aws-fedora.yaml b/tkn/infra-aws-fedora.yaml index 7acd13940..9346a4138 100644 --- a/tkn/infra-aws-fedora.yaml +++ b/tkn/infra-aws-fedora.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-fedora labels: - app.kubernetes.io/version: "0.6.4" + app.kubernetes.io/version: "0.6.5" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -77,7 +77,7 @@ spec: steps: - name: provisioner - image: quay.io/rhqp/qenvs:v0.6.4 + image: quay.io/rhqp/qenvs:v0.6.5 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-aws-mac.yaml b/tkn/infra-aws-mac.yaml index a563acebe..7a2febf3c 100644 --- a/tkn/infra-aws-mac.yaml +++ b/tkn/infra-aws-mac.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-mac labels: - app.kubernetes.io/version: "0.6.4" + app.kubernetes.io/version: "0.6.5" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -96,7 +96,7 @@ spec: steps: - name: provisioner - image: quay.io/rhqp/qenvs:v0.6.4 + image: quay.io/rhqp/qenvs:v0.6.5 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-aws-rhel.yaml b/tkn/infra-aws-rhel.yaml index c87765e00..c8e59e0da 100644 --- a/tkn/infra-aws-rhel.yaml +++ b/tkn/infra-aws-rhel.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-rhel labels: - app.kubernetes.io/version: "0.6.4" + app.kubernetes.io/version: "0.6.5" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -81,7 +81,7 @@ spec: steps: - name: provisioner - image: quay.io/rhqp/qenvs:v0.6.4 + image: quay.io/rhqp/qenvs:v0.6.5 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-aws-windows-server.yaml b/tkn/infra-aws-windows-server.yaml index 9ea1cd3da..3c4889600 100644 --- a/tkn/infra-aws-windows-server.yaml +++ b/tkn/infra-aws-windows-server.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-windows-server labels: - app.kubernetes.io/version: "0.6.4" + app.kubernetes.io/version: "0.6.5" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -86,7 +86,7 @@ spec: steps: - name: provisioner - image: quay.io/rhqp/qenvs:v0.6.4 + image: quay.io/rhqp/qenvs:v0.6.5 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-azure-windows-desktop.yaml b/tkn/infra-azure-windows-desktop.yaml index e07ae0a47..3a79cc1d0 100644 --- a/tkn/infra-azure-windows-desktop.yaml +++ b/tkn/infra-azure-windows-desktop.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-azure-windows-desktop labels: - app.kubernetes.io/version: "0.6.4" + app.kubernetes.io/version: "0.6.5" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -59,7 +59,7 @@ spec: steps: - name: provisioner - image: quay.io/rhqp/qenvs:v0.6.4 + image: quay.io/rhqp/qenvs:v0.6.5 imagePullPolicy: Always script: | #!/bin/sh