Commit 9194ec3e authored Aug 01, 2022 by Thibaud-Vdb

Merge branch '621-add-missing-variable-image-tags-in-some-jobs' into 'latest'

Resolve "Add missing variable image tags in some jobs"

Closes #621

See merge request r2devops/hub!385

parents 835698a1 d4873996

jobs/deploy_s3_terraform/CHANGELOG.md

+4 −0

Original line number	Diff line number	Diff line
		# Changelog
		All notable changes to this job will be documented in this file.

		## [0.2.0] - 2022-07-28
		* Add docker image tag in variable
		* Add job author

		## [0.1.0] - 2022-06-10
		* Initial version
		No newline at end of file

jobs/deploy_s3_terraform/README.md

+5 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ Deploy a static website on a S3 bucket provided by a Terraform state. It is a fu
		\| `AWS_CLI_VERSION` \| The version of the AWS console \| ✅ \| ❌ \| `2.7.7` \|
		\| `TF_ADDRESS` \| Address to terraform state backend \| ✅ \| ❌ \| `${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/main` \|
		\| `TF_ROOT` \| The root directory for Terraform \| ✅ \| ❌ \| `terraform` \|
		\| `IMAGE_TAG` \| The default tag for the docker image \| `1.2:v0.40.0` \|

		## Configuring Terraform

		@@ -157,3 +158,7 @@ For more information here are some useful links :
		Documentation 📕
		- [Terraform with Scaleway](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs)
		- [Bucket policy](https://docs.aws.amazon.com/AmazonS3/latest/userguide/example-bucket-policies.html)


		## Author
		This resource is an [official job](https://docs.r2devops.io/faq-labels/) added in [R2Devops repository](https://gitlab.com/r2devops/hub) by [@GridexX](https://gitlab.com/GridexX)
		No newline at end of file

jobs/deploy_s3_terraform/deploy_s3_terraform.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ cache:
		- "${CI_PROJECT_DIR}/${TF_ROOT}/.terraform"

		deploy_s3_terraform:
		image: registry.gitlab.com/gitlab-org/terraform-images/releases/1.2:v0.40.0
		image: registry.gitlab.com/gitlab-org/terraform-images/releases/${IMAGE_TAG}
		stage: deploy
		variables:
		AWS_ACCESS_KEY_ID: ""
		@@ -27,7 +27,7 @@ deploy_s3_terraform:
		AWS_CLI_VERSION: "2.7.7"
		TF_ADDRESS: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/main"
		TF_ROOT: "${CI_PROJECT_DIR}/terraform"

		IMAGE_TAG: "1.2:v0.40.0"
		script:
		- \|
		apk --no-cache add \

jobs/deployer/CHANGELOG.md

+1 −1

Original line number	Diff line number	Diff line
		# Changelog
		All notable changes to this job will be documented in this file.

		## [0.2.0] - 2022-06-13
		## [0.2.0] - 2022-07-28
		* Add docker image tag in variable

		## [0.1.0] - 2021-04-30

jobs/deployer/README.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ task('deploy', [
		\| `PROJECT_ROOT` \| Path to the directory containing `deploy.php` or `deploy.yaml` \| no \| `.` \|
		\| `DEPLOY_OPTIONS` \| Additional options for command `dep deploy` \| no \| ` ` \|
		\| `DEPLOYER_OUTPUT` \| Name for logs file \| no \| `deployer_output.txt` \|
		\| `IMAGE_TAG` \| The default tag for the docker image \| `7.3-alpine` \|

		## Artifacts