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:
155155- [ GNU Make] ( https://www.gnu.org/software/make/ )
156156- [ Terraform] ( https://www.terraform.io/ ) version 1.2.5
157157- [ 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
160158
161159The following commands will build Docker images for the respective sub-systems
162160and upload them to Google Cloud Platform:
163161
162+ gcloud auth login
163+ gcloud auth configure-docker gcr.io
164+ make cert-renewer
165+ make wpt-server-tot
164166 make publish-cert-renewer
165167 make publish-wpt-server-tot
166168
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ RUN apt-get -qqy update && \
1717 ca-certificates \
1818 curl \
1919 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
2323# For Google Cloud, look under https://packages.cloud.google.com/apt/dists/cloud-sdk/main/binary-amd64/Packages
2424# https://cloud.google.com/storage/docs/gsutil_install
2525# 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" {
99}
1010
1111output "identifier" {
12- value = " ${ var . registry } / ${ var . image } @ ${ data . docker_registry_image . image . sha256_digest } "
12+ value = " ${ data . docker_image . image . repo_digest } "
1313}
1414
15- data "docker_registry_image " "image" {
15+ data "docker_image " "image" {
1616 name = " ${ var . registry } /${ var . image } :latest"
1717}
Original file line number Diff line number Diff line change @@ -71,27 +71,11 @@ resource "google_compute_firewall" "wpt-server-mig-health-check" {
7171 # This range comes from this module that was used previously:
7272 # https://github.com/Ecosystem-Infra/terraform-google-multi-port-managed-instance-group/blob/master/main.tf#L347
7373 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" ]
8874}
8975
9076resource "google_compute_instance_template" "wpt_server" {
9177 name_prefix = " default-"
9278
93- tags = [" allow-ssh" , " ${ var . name } -allow" ]
94-
9579 # As of 2020-06-17, we were running into OOM issues with the 1.7 GB
9680 # "g1-small" instance[1]. This was suspected to be due to 'git gc' needing
9781 # 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" {
4949 }
5050
5151 source_ranges = [" 0.0.0.0/0" ]
52- target_tags = [" ${ var . name } -allow" ]
5352}
You can’t perform that action at this time.
0 commit comments