File tree Expand file tree Collapse file tree 7 files changed +67
-139
lines changed Expand file tree Collapse file tree 7 files changed +67
-139
lines changed Original file line number Diff line number Diff line change @@ -155,12 +155,14 @@ Requirements:
155
155
- [ GNU Make] ( https://www.gnu.org/software/make/ )
156
156
- [ Terraform] ( https://www.terraform.io/ ) version 1.2.5
157
157
- [ Python 3] ( https://python.org )
158
- - access credentials to the Google Cloud Platform project, saved to a file named
159
- ` google-cloud-platform-credentials.json ` in the root pf this repository
160
158
161
159
The following commands will build Docker images for the respective sub-systems
162
160
and upload them to Google Cloud Platform:
163
161
162
+ gcloud auth login
163
+ gcloud auth configure-docker gcr.io
164
+ make cert-renewer
165
+ make wpt-server-tot
164
166
make publish-cert-renewer
165
167
make publish-wpt-server-tot
166
168
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ RUN apt-get -qqy update && \
17
17
ca-certificates \
18
18
curl \
19
19
gnupg \
20
- python3=3.10.6-1~22.04 \
21
- python3-dev=3.10.6-1~22.04 \
22
- python3-pip=22.0.2+dfsg-1
20
+ python3=3.10.6-1~22.04.1 \
21
+ python3-dev=3.10.6-1~22.04.1 \
22
+ python3-pip=22.0.2+dfsg-1ubuntu0.5
23
23
# For Google Cloud, look under https://packages.cloud.google.com/apt/dists/cloud-sdk/main/binary-amd64/Packages
24
24
# https://cloud.google.com/storage/docs/gsutil_install
25
25
# Copy the "Docker Tip" instructions from gsutil_install link and then pin the version
Original file line number Diff line number Diff line change @@ -9,9 +9,9 @@ variable "image" {
9
9
}
10
10
11
11
output "identifier" {
12
- value = " ${ var . registry } / ${ var . image } @ ${ data . docker_registry_image . image . sha256_digest } "
12
+ value = " ${ data . docker_image . image . repo_digest } "
13
13
}
14
14
15
- data "docker_registry_image " "image" {
15
+ data "docker_image " "image" {
16
16
name = " ${ var . registry } /${ var . image } :latest"
17
17
}
Original file line number Diff line number Diff line change @@ -71,27 +71,11 @@ resource "google_compute_firewall" "wpt-server-mig-health-check" {
71
71
# This range comes from this module that was used previously:
72
72
# https://github.com/Ecosystem-Infra/terraform-google-multi-port-managed-instance-group/blob/master/main.tf#L347
73
73
source_ranges = [" 130.211.0.0/22" , " 35.191.0.0/16" ]
74
- target_tags = [" ${ var . name } -allow" ]
75
- }
76
-
77
- resource "google_compute_firewall" "wpt-servers-default-ssh" {
78
- name = " ${ var . name } -wpt-servers-vm-ssh"
79
- network = var. network_name
80
-
81
- allow {
82
- protocol = " tcp"
83
- ports = [" 22" ]
84
- }
85
-
86
- source_ranges = [" 0.0.0.0/0" ]
87
- target_tags = [" allow-ssh" ]
88
74
}
89
75
90
76
resource "google_compute_instance_template" "wpt_server" {
91
77
name_prefix = " default-"
92
78
93
- tags = [" allow-ssh" , " ${ var . name } -allow" ]
94
-
95
79
# As of 2020-06-17, we were running into OOM issues with the 1.7 GB
96
80
# "g1-small" instance[1]. This was suspected to be due to 'git gc' needing
97
81
# more memory, so we upgraded to "e2-medium" (4 GB of RAM).
Original file line number Diff line number Diff line change @@ -49,5 +49,4 @@ resource "google_compute_firewall" "default-lb-fw" {
49
49
}
50
50
51
51
source_ranges = [" 0.0.0.0/0" ]
52
- target_tags = [" ${ var . name } -allow" ]
53
52
}
You can’t perform that action at this time.
0 commit comments