Refresh Docker images (thought-machine#3245)

* Refresh Docker images * of course the docs fail * looks like this got deprecated
toastwaffle · Sep 2, 2024 · 4aa3fa7 · 4aa3fa7
1 parent 09f4cd1
commit 4aa3fa7
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,18 +3,18 @@ jobs:
    build-alpine:
      working_directory: ~/please
      docker:
-       - image: thoughtmachine/please_alpine:20240209
+       - image: thoughtmachine/please_alpine:20240901
      resource_class: large
      environment:
        PLZ_ARGS: "-p --profile ci --profile alpine --exclude no-musl"
      steps:
        - checkout
        - restore_cache:
-           key: go-mod-alpine-v7-{{ checksum "go.mod" }}
+           key: go-mod-alpine-v8-{{ checksum "go.mod" }}
        - restore_cache:
-           key: go-alpine-main-v7-{{ checksum "third_party/go/BUILD" }}
+           key: go-alpine-main-v8-{{ checksum "third_party/go/BUILD" }}
        - restore_cache:
-           key: python-alpine-main-v2-{{ checksum "third_party/python/BUILD" }}
+           key: python-alpine-main-v3-{{ checksum "third_party/python/BUILD" }}
        - run:
            name: Bootstrap & Build
            command: ./bootstrap.sh --test_results_file plz-out/results/please/test_results.xml
@@ -30,31 +30,31 @@ jobs:
        - store_artifacts:
            path: plz-out/log
        - save_cache:
-           key: go-mod-alpine-v7-{{ checksum "go.mod" }}
+           key: go-mod-alpine-v8-{{ checksum "go.mod" }}
            paths:
              - "~/go/pkg/mod"
        - save_cache:
-           key: go-alpine-main-v7-{{ checksum "third_party/go/BUILD" }}
+           key: go-alpine-main-v8-{{ checksum "third_party/go/BUILD" }}
            paths: [ ".plz-cache/third_party/go" ]
        - save_cache:
-           key: python-alpine-main-v2-{{ checksum "third_party/python/BUILD" }}
+           key: python-alpine-main-v3-{{ checksum "third_party/python/BUILD" }}
            paths: [ ".plz-cache/third_party/python" ]
 
    build-linux:
      working_directory: ~/please
      docker:
-       - image: thoughtmachine/please_ubuntu:20240227
+       - image: thoughtmachine/please_ubuntu:20240901
      resource_class: large
      environment:
        PLZ_ARGS: "-p --profile ci"
      steps:
        - checkout
        - restore_cache:
-           key: go-mod-linux-v7-{{ checksum "go.mod" }}
+           key: go-mod-linux-v8-{{ checksum "go.mod" }}
        - restore_cache:
-           key: go-linux-main-v7-{{ checksum "third_party/go/BUILD" }}
+           key: go-linux-main-v8-{{ checksum "third_party/go/BUILD" }}
        - restore_cache:
-           key: python-linux-main-v2-{{ checksum "third_party/python/BUILD" }}
+           key: python-linux-main-v3-{{ checksum "third_party/python/BUILD" }}
        - run:
            name: Bootstrap & Build
            command: ./bootstrap.sh --test_results_file plz-out/results/please/test_results.xml
@@ -78,32 +78,32 @@ jobs:
            name: Test perf framework
            command: plz-out/bin/tools/performance/gen_parse_tree.pex --plz plz-out/bin/src/please --size 1 && plz-out/bin/tools/performance/parse_perf_test.pex --plz plz-out/bin/src/please -n 1
        - save_cache:
-           key: go-mod-linux-v7-{{ checksum "go.mod" }}
+           key: go-mod-linux-v8-{{ checksum "go.mod" }}
            paths:
              - "~/go/pkg/mod"
        - save_cache:
-           key: go-linux-main-v7-{{ checksum "third_party/go/BUILD" }}
+           key: go-linux-main-v8-{{ checksum "third_party/go/BUILD" }}
            paths: [ ".plz-cache/third_party/go" ]
        - save_cache:
-           key: python-linux-main-v2-{{ checksum "third_party/python/BUILD" }}
+           key: python-linux-main-v3-{{ checksum "third_party/python/BUILD" }}
            paths: [ ".plz-cache/third_party/python" ]
 
    build-linux-alt:
      working_directory: ~/please
      docker:
-       - image: thoughtmachine/please_ubuntu_alt:20240207
+       - image: thoughtmachine/please_ubuntu_alt:20240901
      resource_class: large
      environment:
        PLZ_ARGS: "-p -c cover --profile ci-alt"
        PLZ_COVER: "cover --nocoverage_report"
      steps:
        - checkout
        - restore_cache:
-           key: go-mod-linux-alt-v6-{{ checksum "go.mod" }}
+           key: go-mod-linux-alt-v7-{{ checksum "go.mod" }}
        - restore_cache:
-           key: go-linux-alt-v6-{{ checksum "third_party/go/BUILD" }}
+           key: go-linux-alt-v7-{{ checksum "third_party/go/BUILD" }}
        - restore_cache:
-           key: python-linux-alt-v2-{{ checksum "third_party/python/BUILD" }}
+           key: python-linux-alt-v3-{{ checksum "third_party/python/BUILD" }}
        - run:
            name: Bootstrap & Build
            command: ./bootstrap.sh --test_results_file plz-out/results/please/test_results.xml
@@ -112,14 +112,14 @@ jobs:
        - store_artifacts:
            path: plz-out/log
        - save_cache:
-           key: go-mod-linux-alt-v6-{{ checksum "go.mod" }}
+           key: go-mod-linux-alt-v7-{{ checksum "go.mod" }}
            paths:
              - "~/go/pkg/mod"
        - save_cache:
-           key: go-linux-alt-v6-{{ checksum "third_party/go/BUILD" }}
+           key: go-linux-alt-v7-{{ checksum "third_party/go/BUILD" }}
            paths: [ ".plz-cache/third_party/go" ]
        - save_cache:
-           key: python-linux-alt-v2-{{ checksum "third_party/python/BUILD" }}
+           key: python-linux-alt-v3-{{ checksum "third_party/python/BUILD" }}
            paths: [ ".plz-cache/third_party/python" ]
    build-darwin-amd64:
      working_directory: ~/please
@@ -180,7 +180,7 @@ jobs:
    build-linux-arm64:
      working_directory: ~/please
      docker:
-       - image: thoughtmachine/please_ubuntu:20240227
+       - image: thoughtmachine/please_ubuntu:20240901
      resource_class: large
      steps:
        - checkout
@@ -250,7 +250,7 @@ jobs:
    test-rex:
      working_directory: ~/please
      docker:
-       - image: thoughtmachine/please_ubuntu:20240227
+       - image: thoughtmachine/please_ubuntu:20240901
      resource_class: xlarge
      steps:
        - checkout
@@ -267,7 +267,7 @@ jobs:
    test-http-cache:
      working_directory: ~/please
      docker:
-       - image: thoughtmachine/please_ubuntu:20240227
+       - image: thoughtmachine/please_ubuntu:20240901
      resource_class: large
      steps:
        - checkout
@@ -283,7 +283,7 @@ jobs:
    # Releases to github and homebrew
    release:
      docker:
-       - image: thoughtmachine/please_ubuntu:20240227
+       - image: thoughtmachine/please_ubuntu:20240901
      environment:
        GOOGLE_APPLICATION_CREDENTIALS=/tmp/service_account.json
      steps:
@@ -298,7 +298,7 @@ jobs:
    # Releases the docs and the binaries to gs for please.build and get.please.build
    release-gs:
      docker:
-       - image: thoughtmachine/please_ubuntu:20240227
+       - image: thoughtmachine/please_ubuntu:20240901
      environment:
        GOOGLE_APPLICATION_CREDENTIALS=/tmp/service_account.json
      steps:
@@ -310,7 +310,7 @@ jobs:
    # Runs a benchmarking test and records some performance results.
    perf-test:
      docker:
-       - image: thoughtmachine/please_ubuntu:20240227
+       - image: thoughtmachine/please_ubuntu:20240901
      environment:
        GOOGLE_APPLICATION_CREDENTIALS=/tmp/service_account.json
      resource_class: xlarge  # Want to run these tests with a significant amount of parallelism

diff --git a/.circleci/release.sh b/.circleci/release.sh
@@ -4,7 +4,7 @@ set -eu
 
 VERSION=$(cat VERSION)
 
-# Synchronises a folder with the aws and gcp buckets.
+# Synchronises a folder with the gcp bucket.
 release_folder() {
   local folder=$1
   local path=$2

diff --git a/docs/BUILD b/docs/BUILD
@@ -58,7 +58,7 @@ genrule(
 # Plugin versions to pull the docs from
 plugins = {
     "python": "v1.7.3",
-    "java": "v0.4.1",
+    "java": "v0.4.2",
     "go": "v1.21.2",
     "cc": "v0.4.0",
     "shell": "v0.2.0",

diff --git a/test/coverage_output_test.py b/test/coverage_output_test.py
@@ -9,4 +9,4 @@ class CoverageOutputTest(unittest.TestCase):
 
     def test_stuff(self):
         """Test that the flux capacitor is correctly calibrated."""
-        self.assertEquals(2, 2)
+        self.assertEqual(2, 2)
diff --git a/tools/images/ubuntu/Dockerfile b/tools/images/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 MAINTAINER [email protected]
 
 
@@ -11,12 +11,12 @@ RUN truncate -s0 /tmp/preseed.cfg; \
     echo "tzdata tzdata/Zones/Europe select London" >> /tmp/preseed.cfg; \
     apt-get update && \
     apt-get install -y python3 python3-dev python3-pip time \
-    curl unzip git locales pkg-config zlib1g-dev psmisc awscli \
+    curl unzip git locales pkg-config zlib1g-dev psmisc \
     openssh-client ca-certificates && \
     apt-get clean
 
 # Go - we want a specific package version here.
-RUN curl -fsSL https://dl.google.com/go/go1.22.0.linux-amd64.tar.gz | tar -xzC /usr/local
+RUN curl -fsSL https://dl.google.com/go/go1.22.6.linux-amd64.tar.gz | tar -xzC /usr/local
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt
 
 # Locale

diff --git a/tools/images/ubuntu_alt/Dockerfile b/tools/images/ubuntu_alt/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
     apt-get clean
 
 # Go
-RUN curl -fsSL https://dl.google.com/go/go1.21.7.linux-amd64.tar.gz | tar -xzC /usr/local
+RUN curl -fsSL https://dl.google.com/go/go1.22.6.linux-amd64.tar.gz | tar -xzC /usr/local
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt
 
 # Locale