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

Dev to Main #726

Merged
merged 14 commits into from
Apr 19, 2024
Merged

Dev to Main #726

merged 14 commits into from
Apr 19, 2024

Commits on Apr 16, 2024

  1. Buildx bake with goss test runner orchestration (#718)

    * Initial commit of docker buildx bake experiment
    
    * Separate builds for azure/google specialized images
    
    * Specify targets in bake
    
    * Implement test stages on base
    
    * Implement stage tests for base
    
    * Implement stage tests for ppm
    
    * Implement stage tests for connect (borked)
    
    * Update connect just test to work with test stage
    
    * Implement test stage on r-session-complete
    
    * Fix/exclude goss tests for buildx bake
    
    * Implement separate test for Connect
    
    * Remove compose testing and image local justfiles
    
    * Increase timeout for checking Jupyter
    
    * Convert content builds to use bake
    
    * Target content docker-bake file
    
    * Print metadata after build
    
    * Enable GHA caching
    
    * Default to image output
    
    * Remove debug line
    
    * Suppress DL3006
    
    * Extend timeouts for GCW
    
    * Add timeout to r-session-complete jupyter
    
    * Cleanup justfiles
    
    * Update tagging for bake release builds
    
    * Implement bake preview builds
    
    * Update if clause for pushing preview images
    
    * Install requests package
    
    * Provision buildx in preview
    
    * Set file on preview builds
    
    * Fix target names
    
    * Fix CentOS 7 image bad ref
    
    * Calculate RSW download URL in bake
    
    * Wait for launcher startup in Workbench tests
    
    * Add wait time in Workbench test runner to ensure services are up
    
    * Do not cache or output tests
    
    Use a standard runner for content images
    
    * Do not cache or output tests for preview
    
    Provide a buildx config for GHA
    
    Unify test sleep behavior of Workbench images
    
    * Show running processes (debugging)
    
    * Remove test targets
    
    * Remove test layers from Dockerfiles
    
    * Change test running to be orchestrated by a Python script
    
    * Order tags narrowest to broadest
    
    * Update workflow patterns
    
    * Update preview builds for new test script
    
    * Output failed targets
    
    * Rename jobs and add authentication for registries
    
    * Merge build.justfile into Justfile
    
    * README updates
    
    * Update README.md for bake changes
    
    Change `build` targets to aliases
    
    Add a `run` target that leverages docker compose
    
    Remove duplicated targets from bake definitions
    
    * Merge content bake definition into main bake definition
    
    * Change CI build target name
    
    * Unify functions between bake files
    
    * Test separating image lines
    
    * Add missing checkout command
    
    * Abandon reusing buildx builder instance
    
    * Remove bad env.target refs
    
    * Declare bash as shell
    
    * Implement reuse of base images across jobs
    
    * Remove builder references
    
    * Switch print for logging
    
    * Swap runners based on image load
    
    * Add shim for mounting DinD and deps for WGCW
    
    Add entrypoint setting to tests
    
    * Use `--init` flag on tests
    
    * Remove unused base targets
    
    Fix tests on WAML and improve logging
    
    * Turn down compression level
    
    * Update upload artifacts action
    
    * Update preview workflow to match release workflow
    
    Clean up dockerfiles
    
    * Add missing just install
    
    * Update setup-just
    
    * Adapt action to work with Previews
    
    * Move to fully parallel builds
    
    * Use bake-test-push action for previews
    
    * Improve test filtering
    
    * Remove preview base dependency
    
    * Second test filtering fix
    
    * Alias build to bake
    
    * Fix run command
    
    * Update README with test instructions
    
    ---------
    
    Co-authored-by: Chris Ostrouchov <[email protected]>
    ianpittwood and costrouc authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    75e5e62 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. add the libarchive-dev package to image builds

    This is important for the installation of the r-lib/archive package, which
    is used by shinylive, for instance.
    colearendt committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    490e786 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5914a2d View commit details
    Browse the repository at this point in the history
  3. fix spacing

    colearendt committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    01586af View commit details
    Browse the repository at this point in the history
  4. add a sleep to workbench startup... 😭

    We discussed this offline. Workbench apparently has a race condition where it
    starts up and provisions files. If it shuts down before complete, you
    can end up with failing tests and a weird `launcher.pem` file with no data
    and the wrong file permissions. Hopefully this "fix" will not be long lived.
    colearendt committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1cfd3a3 View commit details
    Browse the repository at this point in the history
  5. add TZ env var to prevent system-looking errors

    As discussed in #720, these errors are resolved by setting the TZ
    variable. Setting that variable in the images should ensure that
    these errors are not seen across a wide array of environments.
    colearendt committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1c0c92f View commit details
    Browse the repository at this point in the history
  6. Merge pull request #724 from rstudio/fix-dev

    Fix dev
    ianpittwood authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1424aea View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bdbec6e View commit details
    Browse the repository at this point in the history
  8. Merge pull request #723 from rstudio/add-libarchive

    Add libarchive-dev sysdep
    colearendt authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    a0d7363 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #725 from rstudio/fix-tz

    add TZ env var to prevent system-looking errors
    colearendt authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    19c6dd3 View commit details
    Browse the repository at this point in the history
  10. Extract common operations to reusable scripts in base images (#716)

    * Fix/exclude goss tests for buildx bake
    
    * Implement separate test for Connect
    
    * Implement bake preview builds
    
    * Provision buildx in preview
    
    * Do not cache or output tests for preview
    
    Provide a buildx config for GHA
    
    Unify test sleep behavior of Workbench images
    
    * Remove test targets
    
    * Remove test layers from Dockerfiles
    
    * Change test running to be orchestrated by a Python script
    
    * Update preview builds for new test script
    
    * Create common use scripts in base image for Ubuntu 22.04 images
    
    * Create common use scripts in base image for CentOS 7 images
    
    * Move deps to subdirectory
    
    Fix hadolint issues
    
    * Ignore hadolint issue
    
    * Update permissions hex for tests
    
    * Remove build.justfile
    
    * Remove unnecessary buildx setup from build-bake-preview.yaml
    
    * Move libarchive-dev to ubuntu2204_packages.txt
    ianpittwood authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0d64e87 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Configuration menu
    Copy the full SHA
    c27cd07 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5fed7b9 View commit details
    Browse the repository at this point in the history
  3. Move Quarto installation/configuration to downstream images (#727)

    * Fix/exclude goss tests for buildx bake
    
    * Implement separate test for Connect
    
    * Implement bake preview builds
    
    * Provision buildx in preview
    
    * Do not cache or output tests for preview
    
    Provide a buildx config for GHA
    
    Unify test sleep behavior of Workbench images
    
    * Remove test targets
    
    * Remove test layers from Dockerfiles
    
    * Change test running to be orchestrated by a Python script
    
    * Update preview builds for new test script
    
    * Create common use scripts in base image for Ubuntu 22.04 images
    
    * Create common use scripts in base image for CentOS 7 images
    
    * Move deps to subdirectory
    
    Fix hadolint issues
    
    * Ignore hadolint issue
    
    * Remove build.justfile
    
    * Remove unnecessary buildx setup from build-bake-preview.yaml
    
    * Move Quarto installation downstream
    
    Upgrade Connect and WGCW to 1.4.552
    
    Pin remaining products back to 1.3.340 or lower
    
    * Add SCRIPTS_DIR to downstream Dockerfiles
    
    * Leave original Quarto install for WGCW
    
    * Fix hardcoded QUARTO_VERSION in rstudio-connect.gcfg
    
    * Remove unnecessary Quarto tests from base-pro tests
    
    * Symlink bundled Quarto for Workbench installations
    
    * Fix quarto config replacement in Connect
    
    * Remove QUARTO_VERSION arg from base in bake definition
    
    * Add quarto check command to Connect goss tests
    
    * Remove Quarto build arg from Workbench and r-session-complete
    
    * Update preview Connect build matrix with Quarto version
    
    * Remove Quarto install from CentOS 7 r-session-complete
    
    * Remove package check for Quarto in WGCW
    
    * Use DEFAULT_QUARTO_VERSION for Connect matrix
    
    * Use DEFAULT_QUARTO_VERSION for Connect matrix
    
    * Revert Quarto to 1.3.340 for Connect
    ianpittwood authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    4bef135 View commit details
    Browse the repository at this point in the history