Skip to content

Commit f0afd46

Browse files
committed
chore: cut v0.6.5
Signed-off-by: Adrian Riobo Lorenzo <[email protected]>
1 parent 5d1ff3c commit f0afd46

File tree

7 files changed

+11
-49
lines changed

7 files changed

+11
-49
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION ?= 0.6.4
1+
VERSION ?= 0.6.5
22
CONTAINER_MANAGER ?= podman
33
# Image URL to use all building/pushing image targets
44
IMG ?= quay.io/rhqp/qenvs:v${VERSION}

oci/Containerfile

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
21
FROM registry.access.redhat.com/ubi9/go-toolset:1.21.9-1.1717085562@sha256:d1911ff6e8b3d17175dafe00aa466e83c3ceec45903b01a7cc18e9e417781263 as builder
32

43
USER root
54
WORKDIR /workspace
65
COPY . .
76

87
# renovate: datasource=github-releases depName=pulumi/pulumi
9-
<<<<<<< HEAD
10-
ENV PULUMI_VERSION 3.94.2
11-
=======
128
ENV PULUMI_VERSION 3.116.1
13-
>>>>>>> 0868070 (chore: upgrade deps)
149
ENV PULUMI_URL https://github.com/pulumi/pulumi/releases/download/v${PULUMI_VERSION}/pulumi-v${PULUMI_VERSION}-linux-x64.tar.gz
1510

1611
RUN make build \
@@ -29,58 +24,25 @@ ENV INTERNAL_OUTPUT=/tmp/qenvs \
2924

3025
VOLUME [ "${INTERNAL_OUTPUT}" ]
3126

32-
<<<<<<< HEAD
33-
ENV AWS_CLI_VERSION 2.13.36
34-
ENV AWS_CLI_URL https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip
35-
36-
ENV AZ_CLI_VERSION 2.54.0
37-
=======
3827
ENV AWS_CLI_VERSION 2.15.55
3928
ENV AWS_CLI_URL https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip
4029

4130
ENV AZ_CLI_VERSION 2.61.0
42-
>>>>>>> 0868070 (chore: upgrade deps)
4331
ENV AZ_CLI_RPM https://packages.microsoft.com/rhel/9.0/prod/Packages/a/azure-cli-${AZ_CLI_VERSION}-1.el9.x86_64.rpm
4432

4533
# Pulumi plugins
4634
# renovate: datasource=github-releases depName=pulumi/pulumi-aws
47-
<<<<<<< HEAD
48-
<<<<<<< HEAD
49-
ARG PULUMI_AWS_VERSION=v6.12.1
50-
# renovate: datasource=github-releases depName=pulumi/pulumi-aws
51-
ARG PULUMI_AWSX_VERSION=v2.3.0
52-
# renovate: datasource=github-releases depName=pulumi/pulumi-azure-native
53-
ARG PULUMI_AZURE_NATIVE_VERSION=v2.20.0
54-
=======
55-
ARG PULUMI_AWS_VERSION=v6.37.0
56-
=======
5735
ARG PULUMI_AWS_VERSION=v6.37.1
58-
>>>>>>> bf4b70f (fix(deps): update patch updates to v6.37.1)
5936
# renovate: datasource=github-releases depName=pulumi/pulumi-aws
6037
ARG PULUMI_AWSX_VERSION=v2.3.0
6138
# renovate: datasource=github-releases depName=pulumi/pulumi-azure-native
6239
ARG PULUMI_AZURE_NATIVE_VERSION=v2.42.1
63-
>>>>>>> 0868070 (chore: upgrade deps)
6440
# renovate: datasource=github-releases depName=pulumi/pulumi-command
6541
ARG PULUMI_COMMAND_VERSION=v0.11.1
6642
# renovate: datasource=github-releases depName=pulumi/pulumi-tls
67-
<<<<<<< HEAD
68-
ARG PULUMI_TLS_VERSION=v4.11.1
69-
# renovate: datasource=github-releases depName=pulumi/pulumi-random
70-
<<<<<<< HEAD
71-
ARG PULUMI_RANDOM_VERSION=v4.14.0
72-
=======
73-
ARG PULUMI_RANDOM_VERSION=v4.16.0
74-
>>>>>>> 0868070 (chore: upgrade deps)
75-
=======
7643
ARG PULUMI_TLS_VERSION=v5.0.3
7744
# renovate: datasource=github-releases depName=pulumi/pulumi-random
78-
<<<<<<< HEAD
79-
ARG PULUMI_RANDOM_VERSION=v4.16.1
80-
>>>>>>> 1b21c01 (chore(deps): update patch updates)
81-
=======
8245
ARG PULUMI_RANDOM_VERSION=v4.16.2
83-
>>>>>>> 8e8c4a3 (fix(deps): update patch updates to v4.16.2)
8446

8547
RUN curl ${AWS_CLI_URL} -o awscliv2.zip \
8648
&& dnf install -y unzip \

tkn/infra-aws-fedora.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Task
44
metadata:
55
name: infra-aws-fedora
66
labels:
7-
app.kubernetes.io/version: "0.6.4"
7+
app.kubernetes.io/version: "0.6.5"
88
annotations:
99
tekton.dev/pipelines.minVersion: "0.24.x"
1010
tekton.dev/categories: infrastructure
@@ -77,7 +77,7 @@ spec:
7777

7878
steps:
7979
- name: provisioner
80-
image: quay.io/rhqp/qenvs:v0.6.4
80+
image: quay.io/rhqp/qenvs:v0.6.5
8181
imagePullPolicy: Always
8282
script: |
8383
#!/bin/sh

tkn/infra-aws-mac.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Task
44
metadata:
55
name: infra-aws-mac
66
labels:
7-
app.kubernetes.io/version: "0.6.4"
7+
app.kubernetes.io/version: "0.6.5"
88
annotations:
99
tekton.dev/pipelines.minVersion: "0.24.x"
1010
tekton.dev/categories: infrastructure
@@ -96,7 +96,7 @@ spec:
9696

9797
steps:
9898
- name: provisioner
99-
image: quay.io/rhqp/qenvs:v0.6.4
99+
image: quay.io/rhqp/qenvs:v0.6.5
100100
imagePullPolicy: Always
101101
script: |
102102
#!/bin/sh

tkn/infra-aws-rhel.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Task
44
metadata:
55
name: infra-aws-rhel
66
labels:
7-
app.kubernetes.io/version: "0.6.4"
7+
app.kubernetes.io/version: "0.6.5"
88
annotations:
99
tekton.dev/pipelines.minVersion: "0.24.x"
1010
tekton.dev/categories: infrastructure
@@ -81,7 +81,7 @@ spec:
8181

8282
steps:
8383
- name: provisioner
84-
image: quay.io/rhqp/qenvs:v0.6.4
84+
image: quay.io/rhqp/qenvs:v0.6.5
8585
imagePullPolicy: Always
8686
script: |
8787
#!/bin/sh

tkn/infra-aws-windows-server.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Task
44
metadata:
55
name: infra-aws-windows-server
66
labels:
7-
app.kubernetes.io/version: "0.6.4"
7+
app.kubernetes.io/version: "0.6.5"
88
annotations:
99
tekton.dev/pipelines.minVersion: "0.24.x"
1010
tekton.dev/categories: infrastructure
@@ -86,7 +86,7 @@ spec:
8686

8787
steps:
8888
- name: provisioner
89-
image: quay.io/rhqp/qenvs:v0.6.4
89+
image: quay.io/rhqp/qenvs:v0.6.5
9090
imagePullPolicy: Always
9191
script: |
9292
#!/bin/sh

tkn/infra-azure-windows-desktop.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Task
44
metadata:
55
name: infra-azure-windows-desktop
66
labels:
7-
app.kubernetes.io/version: "0.6.4"
7+
app.kubernetes.io/version: "0.6.5"
88
annotations:
99
tekton.dev/pipelines.minVersion: "0.24.x"
1010
tekton.dev/categories: infrastructure
@@ -59,7 +59,7 @@ spec:
5959

6060
steps:
6161
- name: provisioner
62-
image: quay.io/rhqp/qenvs:v0.6.4
62+
image: quay.io/rhqp/qenvs:v0.6.5
6363
imagePullPolicy: Always
6464
script: |
6565
#!/bin/sh

0 commit comments

Comments
 (0)