Skip to content

Refresh Docker images #3245

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

Merged
peterebden merged 3 commits into from
Sep 2, 2024
Merged

Refresh Docker images #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dd261f
Refresh Docker images
peterebden Sep 1, 2024
088a38c
of course the docs fail
peterebden Sep 1, 2024
fd70729
looks like this got deprecated
peterebden Sep 1, 2024
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
54 changes: 27 additions & 27 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .circleci/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/coverage_output_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions tools/images/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy
FROM ubuntu:noble
MAINTAINER peter.ebden@gmail.com


Expand All @@ -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 \
Copy link
Copy Markdown
Collaborator Author

@peterebden peterebden Sep 1, 2024

Choose a reason for hiding this comment

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

awscli doesn't appear to be available in noble - it's probably a snap or smthn. I don't think we need it any more anyway

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
Expand Down
2 changes: 1 addition & 1 deletion tools/images/ubuntu_alt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down