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.

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

Jump to bottom

BREAKING: repository structure change #782

Merged
merged 59 commits into from
Apr 29, 2024
Merged

BREAKING: repository structure change #782

merged 59 commits into from
Apr 29, 2024

Conversation

eitsupi
Copy link
Member

@eitsupi eitsupi commented Apr 21, 2024 •
edited
Loading

Part of #776

  • Update Dockerfiles
    • Update main Dockerfiles
    • Update devel Dockerfiles
    • Update binder Dockerfiles
    • Update cuda Dockerfiles
    • Update extra Dockerfiles
  • Update docker-bake.json
    • Update main docker-bake.json (renamed from core)
    • Update devel docker-bake.json
    • Update binder docker-bake.json (renamed to extra)
    • Update cuda docker-bake.json (renamed to extra)
    • Update extra docker-bake.json (renamed to experimental)
  • Update documents
  • Update CI
    • Update Makefile
    • Update GHA yaml files
    • Update reports/wiki templates

@eitsupi eitsupi requested a review from cboettig April 21, 2024 12:54
@eitsupi
Copy link
Member Author

eitsupi commented Apr 21, 2024

@cboettig Sorry for the delay, but now that we can generate at least some Dockerfiles and bakefiles, could you please take a look at this?

eitsupi
eitsupi commented Apr 21, 2024
View reviewed changes
build/scripts/generate-main-bakefiles.R Outdated Show resolved Hide resolved
build/scripts/generate-main-dockerfiles.R Outdated Show resolved Hide resolved
cboettig
cboettig reviewed Apr 21, 2024
View reviewed changes
Copy link
Member

@cboettig cboettig left a comment

Choose a reason for hiding this comment

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

I think everything here so far looks very solid!

Regarding the building last 2 versions: this all makes sense. But in this new setup is it still possible to occasionally build older versions in order to benefit from the ubuntu-lts security patches released for them?

build/scripts/generate-args.R Outdated Show resolved Hide resolved
@eitsupi
Copy link
Member Author

eitsupi commented Apr 21, 2024

But in this new setup is it still possible to occasionally build older versions in order to benefit from the ubuntu-lts security patches released for them?

This is only possible for images that have the exact same structure as the most recent images.

For example, r-ver is fine for all versions, but rstudio cannot go back beyond a certain point because it becomes impossible to build linux/arm64 platform at some point.

@eitsupi
Copy link
Member Author

eitsupi commented Apr 22, 2024 •
edited
Loading

@cboettig Do you think geospatial-ubuntugis is still needed?
I would like to remove this as I don't think any work has been done on these images in the last few years.

@cboettig
Copy link
Member

@nathanweeks many thanks for this tip! I can confirm this works on other builds I've tried with very large images, e.g.
https://github.com/boettiger-lab/k8s/actions/runs/8857066532/job/24324087762

Uploading image.png…

@eitsupi
build: commit args history to the tsv file (for versions in reports)
14129f2
@eitsupi
build: update versions.Rmd for the new repo structure
74b50d2
@eitsupi
build: fix the lack of binder target in bake-files
8881ef1
@eitsupi
build: update wiki_home.Rmd for the new repo structure
62d98b5
@eitsupi
ci: ensure inspect experimental images and ensure build wiki in PR
a1376cd
@eitsupi
Merge remote-tracking branch 'upstream/master' into overhaul
8a5f5c0
@eitsupi
ci: fix build wiki job to download experimental image info
209a4f4
@eitsupi
ci: tweak concurrency for PRs
a3ccdfc
@eitsupi
ci: ensure always upload the reports for checking
183265d
@eitsupi
build(wiki): now some rows may be duplicated, so ensure remove these
aee06e2
@eitsupi
docs(wiki): fix ordering of the table content
907c72b
@eitsupi
ci: add a new workflow to build and push experimental images
7afda5c
@eitsupi
docs: update for the new repo structure
57ce4c8
@eitsupi
docs(wiki): tweak ordering of the table contents
b8df6bf
@eitsupi
build: fix the regex to ensure remove old extra docker-bake.json
83c6959
@eitsupi
chore: re run make setup
3d2e985
@eitsupi eitsupi marked this pull request as ready for review April 29, 2024 13:35
@eitsupi
Copy link
Member Author

eitsupi commented Apr 29, 2024

Let's merging for now...

@eitsupi eitsupi merged commit 8417113 into master Apr 29, 2024
23 of 30 checks passed
@eitsupi eitsupi deleted the overhaul branch April 29, 2024 13:53
This was referenced Apr 29, 2024
Closed
Merged
eitsupi added a commit that referenced this pull request Apr 30, 2024
@eitsupi
fix(dockerfiles): ensure copy neccesarry scripts (#796)
a8789c4 
A follow up for #782
@wetlandscapes wetlandscapes mentioned this pull request May 1, 2024
Closed
@eitsupi eitsupi mentioned this pull request May 1, 2024
Merged
eitsupi added a commit that referenced this pull request May 1, 2024
@eitsupi
fix(dockerfile): re add the LANG environment variable (#802)
4871839 
A follow up for #782

I was looking at the wiki and realized that I had forgotten to set the
LANG environment variable for rocker/r-ver.
@infotroph infotroph mentioned this pull request Jul 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cboettig cboettig cboettig left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@eitsupi @cboettig @nathanweeks