Skip to content
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.

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

Docker buildx bake experiment for builds #705

Closed
wants to merge 37 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ca7dbb4
Initial commit of docker buildx bake experiment
costrouc Mar 12, 2024
b8c32a2
Separate builds for azure/google specialized images
costrouc Mar 12, 2024
57938e5
Specify targets in bake
costrouc Mar 12, 2024
77cd9e8
Implement test stages on base
ianpittwood Apr 2, 2024
b164335
Implement stage tests for base
ianpittwood Apr 3, 2024
bf20f94
Implement stage tests for ppm
ianpittwood Apr 3, 2024
d02d71d
Implement stage tests for connect (borked)
ianpittwood Apr 3, 2024
d094625
Update connect just test to work with test stage
ianpittwood Apr 3, 2024
e552094
Implement test stage on r-session-complete
ianpittwood Apr 3, 2024
a464776
Fix/exclude goss tests for buildx bake
ianpittwood Apr 4, 2024
9fefe59
Implement separate test for Connect
ianpittwood Apr 5, 2024
9f263bb
Remove compose testing and image local justfiles
ianpittwood Apr 5, 2024
0dbf4a5
Increase timeout for checking Jupyter
ianpittwood Apr 5, 2024
9bd2b71
Convert content builds to use bake
ianpittwood Apr 5, 2024
ca6e41f
Target content docker-bake file
ianpittwood Apr 5, 2024
6ae5bb2
Print metadata after build
ianpittwood Apr 5, 2024
0a1faf2
Enable GHA caching
ianpittwood Apr 5, 2024
a7b55d3
Default to image output
ianpittwood Apr 5, 2024
32a90d6
Remove debug line
ianpittwood Apr 5, 2024
9e9ac3a
Suppress DL3006
ianpittwood Apr 5, 2024
929f9bc
Extend timeouts for GCW
ianpittwood Apr 8, 2024
165eb81
Add timeout to r-session-complete jupyter
ianpittwood Apr 8, 2024
e54f564
Cleanup justfiles
ianpittwood Apr 8, 2024
68e44ba
Update tagging for bake release builds
ianpittwood Apr 8, 2024
7df68cb
Implement bake preview builds
ianpittwood Apr 8, 2024
a3de06c
Update if clause for pushing preview images
ianpittwood Apr 8, 2024
59863b2
Install requests package
ianpittwood Apr 8, 2024
09dac6f
Provision buildx in preview
ianpittwood Apr 8, 2024
dccb4bb
Set file on preview builds
ianpittwood Apr 8, 2024
8ce3a47
Fix target names
ianpittwood Apr 8, 2024
8026d4e
Fix CentOS 7 image bad ref
ianpittwood Apr 8, 2024
8ccd226
Calculate RSW download URL in bake
ianpittwood Apr 8, 2024
004006c
Wait for launcher startup in Workbench tests
ianpittwood Apr 9, 2024
74e3f54
Add wait time in Workbench test runner to ensure services are up
ianpittwood Apr 9, 2024
427b895
Do not cache or output tests
ianpittwood Apr 9, 2024
7553450
Do not cache or output tests for preview
ianpittwood Apr 9, 2024
c9e8719
Show running processes (debugging)
ianpittwood Apr 9, 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
Prev Previous commit
Next Next commit
Update connect just test to work with test stage
  • Loading branch information
ianpittwood committed Apr 3, 2024
commit d0946259d58994e44684801cc97a2fc20b6db966
23 changes: 8 additions & 15 deletions connect/Justfile
Original file line number Diff line number Diff line change
@@ -45,22 +45,15 @@ build OS=IMAGE_OS VERSION=RSC_VERSION +TAGS=DEFAULT_TAG:
--file=./Dockerfile.$(just -f ../Justfile _parse-os {{OS}}) .

# Test Connect image - just test rstudio/rstudio-connect:ubuntu2204-2022.10.0 2022.10.0
test TAG=DEFAULT_TAG VERSION=RSC_VERSION CMD="":
test OS="ubuntu2204" VERSION=RSC_VERSION:
#!/usr/bin/env bash
set -euxo pipefail
IMAGE_NAME="{{ TAG }}" \
RSC_VERSION="{{ VERSION }}" \
RSC_LICENSE="{{ RSC_LICENSE }}" \
RSC_LICENSE_SERVER="{{ RSC_LICENSE_SERVER }}" \
R_VERSION="{{ R_VERSION }}" \
R_VERSION_ALT="{{ R_VERSION_ALT }}" \
PYTHON_VERSION="{{ PYTHON_VERSION }}" \
PYTHON_VERSION_ALT="{{ PYTHON_VERSION_ALT }}" \
docker-compose -f ./docker-compose.test.yml run sut {{ CMD }}

# Test Connect image interactively - just test-i rstudio/rstudio-connect:ubuntu2204-2022.10.0 2022.10.0
test-i TAG=DEFAULT_TAG VERSION=RSC_VERSION:
just test {{ TAG }} {{ VERSION }} bash
docker buildx --builder="{{ BUILDX_PATH }}" build ${BUILDX_ARGS} --allow security.insecure --target test \
--build-arg RSC_VERSION="{{ VERSION }}" \
--build-arg R_VERSION="{{ R_VERSION }}" \
--build-arg R_VERSION_ALT="{{ R_VERSION_ALT }}" \
--build-arg PYTHON_VERSION="{{ PYTHON_VERSION }}" \
--build-arg PYTHON_VERSION_ALT="{{ PYTHON_VERSION_ALT }}" \
--file=./Dockerfile.$(just -f ../Justfile _parse-os {{OS}}) .

# Run Connect - just RSC_LICENSE="<RSC license>" run rstudio/rstudio-connect:ubuntu2204-2022.10.0
run TAG=DEFAULT_TAG CMD="":