Skip to content

Update os to Ubuntu 24 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: ubuntu-22.04
Choose a base branch
from
Open

Update os to Ubuntu 24 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ $(BUILDBOX_IIDFILE): docker/build/Dockerfile | $(BUILDDIR)

.PHONY: containers
containers: ## Build container images.
containers: build lint
containers: build
$(MAKE) -C docker containers

.PHONY: publish
publish: ## Publish container images to quay.io.
publish: build lint
publish: build
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go linter has vastly changed from go version 1.17.x to 1.24.5. Since we anyways dont use go linters - keeping this off for now

$(MAKE) -C docker -j publish

.PHONY: clean
Expand Down
3 changes: 2 additions & 1 deletion assets/terraform/gce/os.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ variable "oss" {
"ubuntu:18" = "ubuntu-os-cloud/ubuntu-1804-bionic-v20210825"
"ubuntu:20" = "ubuntu-os-cloud/ubuntu-2004-focal-v20210825"
"ubuntu:22" = "ubuntu-os-cloud/ubuntu-2204-jammy-v20240904"
"ubuntu:latest" = "ubuntu-os-cloud/ubuntu-2204-jammy-v20240904"
"ubuntu:24" = "ubuntu-os-cloud/ubuntu-2404-noble-arm64-v20250130"
"ubuntu:latest" = "ubuntu-os-cloud/ubuntu-2404-noble-arm64-v20250130"

"redhat:7.8" = "rhel-cloud/rhel-7-v20200910"
"redhat:7.9" = "rhel-cloud/rhel-7-v20210817"
Expand Down
4 changes: 2 additions & 2 deletions assets/terraform/vsphere/os.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ variable "oss" {
default = {
"redhat:7.9" = "toTemplate1"
"redhat7.9" = "toTemplate1"
"ubuntu:22" = "gravity-2.0-e2e"
"ubuntu22" = "gravity-2.0-e2e"
"ubuntu:24" = "gravity-2.0-e2e"
"ubuntu24" = "gravity-2.0-e2e"
}
}

Expand Down
2 changes: 1 addition & 1 deletion docker/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM quay.io/gravitational/debian-venti:go1.17.5-stretch
FROM quay.io/gravitational/debian-venti:go1.24.5-bookworm

ARG UID
ARG GID
Expand Down
2 changes: 1 addition & 1 deletion docker/suite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM quay.io/gravitational/debian-grande:bullseye
FROM quay.io/gravitational/debian-grande:bookworm

RUN apt-get update && \
apt-get install -y curl unzip gnupg2 dirmngr
Expand Down