Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
holi-chat-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
app
holi-chat-server
Commits
98d5f7c5
Commit
98d5f7c5
authored
4 weeks ago
by
Ole Langbehn
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' into production
parents
3fdb827a
7b7df2a3
Branches
HOTFIX-challenges-carousel
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
.gitlab-ci.yml
.terraform-version
+1
-1
1 addition, 1 deletion
.terraform-version
terraform/common/init.tf
+2
-2
2 additions, 2 deletions
terraform/common/init.tf
terraform/environments/init.tf
+2
-2
2 additions, 2 deletions
terraform/environments/init.tf
with
8 additions
and
8 deletions
.gitlab-ci.yml
+
3
−
3
View file @
98d5f7c5
...
...
@@ -17,10 +17,10 @@ default:
-
1cpu-4gb
# build on smaller machine
build_docker
:
image
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:2
7
'
image
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:2
8
'
stage
:
"
build"
services
:
-
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:2
7
-dind'
-
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:2
8
-dind'
alias
:
'
docker'
variables
:
# this could be fetched via terraform output ("gcr_location" in infra project), but then we would need an extra job for terraform
...
...
@@ -43,7 +43,7 @@ build_docker:
.deploy
:
stage
:
"
deploy"
image
:
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.1
0.5
'
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.1
1.0
'
# default entrypoint is terraform command, but we want to run shell scripts
entrypoint
:
[
"
/bin/sh"
,
"
-c"
]
variables
:
...
...
This diff is collapsed.
Click to expand it.
.terraform-version
+
1
−
1
View file @
98d5f7c5
1.1
0.5
1.1
1.0
This diff is collapsed.
Click to expand it.
terraform/common/init.tf
+
2
−
2
View file @
98d5f7c5
...
...
@@ -4,11 +4,11 @@ terraform {
required_providers
{
google
=
{
source
=
"hashicorp/google"
version
=
"6.2
2
.0"
version
=
"6.2
4
.0"
}
google-beta
=
{
source
=
"hashicorp/google-beta"
version
=
"6.2
2
.0"
version
=
"6.2
4
.0"
}
}
backend
"gcs"
{
...
...
This diff is collapsed.
Click to expand it.
terraform/environments/init.tf
+
2
−
2
View file @
98d5f7c5
...
...
@@ -4,11 +4,11 @@ terraform {
required_providers
{
google
=
{
source
=
"hashicorp/google"
version
=
"6.2
2
.0"
version
=
"6.2
4
.0"
}
google-beta
=
{
source
=
"hashicorp/google-beta"
version
=
"6.2
2
.0"
version
=
"6.2
4
.0"
}
}
backend
"gcs"
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment