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

Building in docker #40

Merged
merged 18 commits into from
Mar 5, 2019
Merged

Building in docker #40

merged 18 commits into from
Mar 5, 2019

Conversation

wdwatkins
Copy link
Contributor

This adds the docker source code, a few little fixes to make the build go faster, and the jenkinsfile

@@ -12,7 +12,7 @@ fetch.dv_data <- function(viz){
sites <- deps[["sites"]]

startDate <- paste0(year, "-01-01")
endDate <- paste0(year, "-12-31")
endDate <- paste0(year, "-01-02")
Copy link
Member

Choose a reason for hiding this comment

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

Safe to revert this change now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, although really I'd say these dates should all be moved into the viz.yaml so they can be set in a single place

Copy link
Member

Choose a reason for hiding this comment

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

Fair. Up to you how you do it, but note that we're not currently sure that anybody will be developing this interactive viz any more this year, so code quality/maintainability matters somewhat less than usual.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, probably wouldn't bother doing it now

@@ -12,7 +12,7 @@ fetch.dv_sites <- function(viz){
year <- deps[["year"]][["year"]]

startDate <- paste0(year, "-01-01")
endDate <- paste0(year, "-12-31")
endDate <- paste0(year, "-01-02")
Copy link
Member

Choose a reason for hiding this comment

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

revert this change?

@@ -18,7 +18,7 @@ info:
version: 0.9-7
dataRetrieval:
repo: CRAN
version: 2.7.4
version: 2.7.3
Copy link
Member

Choose a reason for hiding this comment

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

does the older version work better?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was just to avoid having to set package installs to GRAN, since CRAN only has 2.7.3

Copy link
Member

Choose a reason for hiding this comment

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

oh, OK

version: 1.1.6
geojsonio:
repo: CRAN
version: 0.6.0
Copy link
Member

Choose a reason for hiding this comment

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

It'd be nice to think about removing all of these declared package dependencies as we switch to Docker (because now the Dockerfile is where the decisions actually get made about which package version gets used). Is now too soon to do so, and if not, is it as simple as deleting all the lines in this subsection, or does vizlab give errors if you do that?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We just would need to remove the checkVizPackages() call invizmake(), since that requires there to be a packages yaml block. Otherwise, I think we could probably just drop the packages section, unless we don't feel confident relying on the package versions that come through the rocker images.

There is probably a fair bit of code associated with checkVizPackages that could either be removed from vizlab, unless we wanted to preserve a way of checking package versions against some reference.

Copy link
Member

Choose a reason for hiding this comment

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

OK, thanks for thinking it through. I'll create a GitHub issue in vizlab for this, and we can resolve it (including cleaning up the extra code) after we've had a chance to kick the tires on the Docker option for a while.

What happens if you make a packages YAML block but leave it empty?

Copy link
Member

Choose a reason for hiding this comment

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

Added this issue: USGS-VIZLAB/vizlab#395

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That just returns a null from checkVizPackages, I think that would work

@aappling-usgs aappling-usgs merged commit ae2e8a6 into USGS-VIZLAB:master Mar 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants