Skip to content

Commit

Permalink
Merge pull request #57 from entando-k8s/ENG-3564-v1beta1-upgrade
Browse files Browse the repository at this point in the history
ENG-3564: v1beta1 upgrade to v1
  • Loading branch information
w-caffiero-entando authored May 3, 2022
2 parents 38fd4a6 + 8185e83 commit e2ff928
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.jvm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM entando/entando-k8s-operator-common:7.0.1-ENG-3480-PR-96
FROM entando/entando-k8s-operator-common:7.0.2
ARG VERSION
LABEL name="Entando K8S App Controller" \
vendor="Entando" \
version="v${VERSION}" \
release="6" \
release="7.0" \
summary="This container processes the EntandoApp custom resource and deploys the specified Entando App Engine Docker image." \
description="This is a run-to-completion container. It processes new EntandoApp Custom \
Resources and deploys an instance of the specified Entando App Engine Docker image \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.native
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL name="Entando K8S App Controller" \
vendor="Entando" \
version="v${VERSION}" \
release="6" \
release="7.0" \
summary="This container processes the EntandoApp custom resource and deploys the specified Entando App Engine Docker image." \
description="This is a run-to-completion container. It processes new EntandoApp Custom \
Resources and deploys an instance of the specified Entando App Engine Docker image \
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<version>7.0.0</version>
<relativePath/>
</parent>
<version>7.0.1</version>
<version>7.0.2</version>
<artifactId>entando-k8s-app-controller</artifactId>
<name>Entando K8S Controller for Entando App Deployments</name>
<description>Entando's K8S Controller for Entando App Deployments</description>
Expand Down Expand Up @@ -64,7 +64,7 @@
<properties>
<github.organization>entando-k8s</github.organization>
<sonar.projectKey>${github.organization}_${project.artifactId}</sonar.projectKey>
<entando-k8s-operator-common.version>7.0.1-ENG-3480-PR-96</entando-k8s-operator-common.version>
<entando-k8s-operator-common.version>7.0.2</entando-k8s-operator-common.version>
<skipLicenseDownload>true</skipLicenseDownload>
<preDeploymentTestGroups>in-process</preDeploymentTestGroups>
<postDeploymentTestGroups>smoke</postDeploymentTestGroups>
Expand Down

0 comments on commit e2ff928

Please sign in to comment.