From 9b54da5f27272078e2a422d039a2050cb5a3112a Mon Sep 17 00:00:00 2001 From: Ilyes Ben Dlala Date: Thu, 15 Sep 2022 17:08:46 +0200 Subject: [PATCH 1/3] ci(demo-target): Renamed the docker images of demo-targets to include a "demo-target-" prefix Closes #https://github.com/secureCodeBox/secureCodeBox/issues/720 BREAKING CHANGE: Signed-off-by: Ilyes Ben Dlala --- .github/workflows/release-build.yaml | 4 ++-- demo-targets/old-joomla/values.yaml | 4 ++-- demo-targets/old-typo3/values.yaml | 2 +- demo-targets/old-wordpress/values.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index f25eac4141..0dde84bf77 100644 --- a/.github/workflows/release-build.yaml +++ b/.github/workflows/release-build.yaml @@ -516,7 +516,7 @@ jobs: id: docker_meta uses: docker/metadata-action@v3 with: - images: ${{ env.DOCKER_NAMESPACE }}/${{ matrix.target }} + images: ${{ env.DOCKER_NAMESPACE }}/demo-target-${{ matrix.target }} tags: | type=sha latest @@ -546,5 +546,5 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - repository: ${{ env.DOCKER_NAMESPACE }}/${{ matrix.target }} + repository: ${{ env.DOCKER_NAMESPACE }}/demo-target-${{ matrix.target }} readme-filepath: ./demo-targets/${{ matrix.target }}/docs/README.DockerHub-Target.md diff --git a/demo-targets/old-joomla/values.yaml b/demo-targets/old-joomla/values.yaml index 1417c73428..ebb7be2687 100644 --- a/demo-targets/old-joomla/values.yaml +++ b/demo-targets/old-joomla/values.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# Default values for old-wordpress. +# Default values for old-joomla. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -10,7 +10,7 @@ replicaCount: 1 image: # image.repository -- Container Image - repository: docker.io/securecodebox/old-joomla + repository: docker.io/securecodebox/demo-target-old-joomla # image.tag -- The image tag # @default -- defaults to the appVersion tag: null diff --git a/demo-targets/old-typo3/values.yaml b/demo-targets/old-typo3/values.yaml index 4766177760..562e310ce2 100644 --- a/demo-targets/old-typo3/values.yaml +++ b/demo-targets/old-typo3/values.yaml @@ -10,7 +10,7 @@ replicaCount: 1 image: # image.repository -- Container Image - repository: docker.io/securecodebox/old-typo3 + repository: docker.io/securecodebox/demo-target-old-typo3 # image.tag -- The image tag # @default -- defaults to the appVersion tag: v9.4 diff --git a/demo-targets/old-wordpress/values.yaml b/demo-targets/old-wordpress/values.yaml index 3787bfa7f6..610959698a 100644 --- a/demo-targets/old-wordpress/values.yaml +++ b/demo-targets/old-wordpress/values.yaml @@ -10,7 +10,7 @@ replicaCount: 1 image: # image.repository -- Container Image - repository: docker.io/securecodebox/old-wordpress + repository: docker.io/securecodebox/demo-target-old-wordpress # image.tag -- The image tag # @default -- defaults to the appVersion tag: null From fe15b5a7bc980cac411f1d4beaea8617c29e9e76 Mon Sep 17 00:00:00 2001 From: Ilyes Ben Dlala Date: Thu, 22 Sep 2022 14:32:32 +0200 Subject: [PATCH 2/3] docs(demo-target): Included a notice in the UPGRADING.md for changes to the demo-target names Signed-off-by: Ilyes Ben Dlala --- UPGRADING.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/UPGRADING.md b/UPGRADING.md index cda5e67255..410cc4d969 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -123,4 +123,15 @@ kubectl --namespace delete role lurcher ### Removed Hook Teams Webhook We implemented a more general *[notification hook](https://www.securecodebox.io/docs/hooks/notification-hook)* which can be used to notify different systems like *[MS Teams](https://www.securecodebox.io/docs/hooks/notification-hook#configuration-of-a-ms-teams-notification)* and *[Slack](https://www.securecodebox.io/docs/hooks/notification-hook#configuration-of-a-slack-notification)* and also [Email](https://www.securecodebox.io/docs/hooks/notification-hook#configuration-of-an-email-notification) based in a more flexible way with [custom message templates](https://www.securecodebox.io/docs/hooks/notification-hook#custom-message-templates). With this new hook in place it is not nessesary to maintain the preexisting MS Teams Hook any longer and therefore we removed it. -➡️ [Reference: #570](https://github.com/secureCodeBox/secureCodeBox/pull/570) \ No newline at end of file +➡️ [Reference: #570](https://github.com/secureCodeBox/secureCodeBox/pull/570) + +## From 3.X to 4.X +### Renamed the docker images of demo-targets to include a "demo-target-" prefix +The docker images for the custom demo targets built by secureCodeBox to include a "demo-target-" prefix i.e: + * securecodebox/old-typo3 --> securecodebox/**demo-target**-old-typo3 + * securecodebox/old-joomla --> securecodebox/**demo-target**-old-joomla + * securecodebox/old-wordpress --> securecodebox/**demo-target**-old-wordpress + +These images are usually used for testing and demo purposes. If you use these images, you would have to rename them appropriately. + +➡️ [Reference: #1360](https://github.com/secureCodeBox/secureCodeBox/pull/1360) \ No newline at end of file From 4d06fefc27f6546bd6e7762631ebe6d2d8efae25 Mon Sep 17 00:00:00 2001 From: Ilyes Ben Dlala Date: Tue, 27 Sep 2022 13:00:39 +0200 Subject: [PATCH 3/3] docs(demo-target): Fixed wrong comments in values.yaml files for the demo-targets Applied review suggestions Signed-off-by: Ilyes Ben Dlala --- demo-targets/old-joomla/values.yaml | 2 +- demo-targets/old-typo3/values.yaml | 2 +- demo-targets/old-wordpress/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demo-targets/old-joomla/values.yaml b/demo-targets/old-joomla/values.yaml index ebb7be2687..c96d5e8021 100644 --- a/demo-targets/old-joomla/values.yaml +++ b/demo-targets/old-joomla/values.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# Default values for old-joomla. +# Default values for demo-target-old-joomla. # This is a YAML-formatted file. # Declare variables to be passed into your templates. diff --git a/demo-targets/old-typo3/values.yaml b/demo-targets/old-typo3/values.yaml index 562e310ce2..dd50e661d0 100644 --- a/demo-targets/old-typo3/values.yaml +++ b/demo-targets/old-typo3/values.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# Default values for old-wordpress. +# Default values for demo-target-old-typo3. # This is a YAML-formatted file. # Declare variables to be passed into your templates. diff --git a/demo-targets/old-wordpress/values.yaml b/demo-targets/old-wordpress/values.yaml index 610959698a..60e5b9a238 100644 --- a/demo-targets/old-wordpress/values.yaml +++ b/demo-targets/old-wordpress/values.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# Default values for old-wordpress. +# Default values for demo-target-old-wordpress. # This is a YAML-formatted file. # Declare variables to be passed into your templates.