Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
erikarasnick committed Apr 2, 2024
1 parent ac48744 commit 2c0e029
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
48 changes: 24 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
# Load R image
FROM rocker/r-ver:4.3.0

# DeGAUSS container metadata
ENV degauss_name="daymet"
ENV degauss_version="0.1.0"
ENV degauss_description="daymet climate variables"
ENV degauss_argument="short description of optional argument [default: 'insert_default_value_here']"

# add OCI labels based on environment variables too
LABEL "org.degauss.name"="${degauss_name}"
LABEL "org.degauss.version"="${degauss_version}"
LABEL "org.degauss.description"="${degauss_description}"
LABEL "org.degauss.argument"="${degauss_argument}"

# Load R image
FROM rocker/r-ver:4.3.0

# DeGAUSS container metadata
ENV degauss_name="daymet"
ENV degauss_version="0.1.1"
ENV degauss_description="daymet climate variables"
ENV degauss_argument="short description of optional argument [default: 'insert_default_value_here']"

# add OCI labels based on environment variables too
LABEL "org.degauss.name"="${degauss_name}"
LABEL "org.degauss.version"="${degauss_version}"
LABEL "org.degauss.description"="${degauss_description}"
LABEL "org.degauss.argument"="${degauss_argument}"

WORKDIR /app

RUN apt-get update -y
RUN apt-get install libxml2-dev zlib1g-dev libfontconfig1-dev libssl-dev libcurl4-openssl-dev libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev libudunits2-dev cmake libnetcdf-dev libgdal-dev libgeos-dev libproj-dev libsqlite0-dev -y

# Install R dependencies
RUN R -e "install.packages(c('daymetr', 'tidyverse', 'terra', 'gtools', 'data.table', 'remotes', 'withr'))"
RUN R --quiet -e "remotes::install_github('degauss-org/dht')"

COPY entrypoint.R .

RUN apt-get install libxml2-dev zlib1g-dev libfontconfig1-dev libssl-dev libcurl4-openssl-dev libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev libudunits2-dev cmake libnetcdf-dev libgdal-dev libgeos-dev libproj-dev libsqlite0-dev -y

# Install R dependencies
RUN R -e "install.packages(c('daymetr', 'tidyverse', 'terra', 'gtools', 'data.table', 'remotes', 'withr'))"
RUN R --quiet -e "remotes::install_github('degauss-org/dht')"

COPY entrypoint.R .

WORKDIR /tmp

ENTRYPOINT ["/usr/local/bin/Rscript", "/app/entrypoint.R"]
ENTRYPOINT ["/usr/local/bin/Rscript", "/app/entrypoint.R"]

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Note: The Daymet calendar is based on a standard calendar year. All Daymet years
If `my_addresses.csv` is a file in the current working directory with ID column `id`, start and end date columns `start_date` and `end_date`, and coordinate columns named `lat` and `lon`, then the [DeGAUSS command](https://degauss.org/using_degauss.html#DeGAUSS_Commands):

```sh
docker run --rm -v $PWD:/tmp ghcr.io/degauss-org/daymet:0.1.0 loyalty_degauss.csv
docker run --rm -v $PWD:/tmp ghcr.io/degauss-org/daymet:0.1.1 loyalty_degauss.csv
```

will produce `my_addresses_daymet_0.1.0.csv` with added columns:
will produce `my_addresses_daymet_0.1.1.csv` with added columns:

- **`tmax`**: maximum temperature
- **`tmin`**: minimum temperature
Expand All @@ -29,7 +29,7 @@ will produce `my_addresses_daymet_0.1.0.csv` with added columns:
- **`prcp`**: precipitation
- **`dayl`**: day length

Other columns may be present in the input `my_addresses.csv` file, and these other columns will be linked in and included in the output `my_addresses_daymet_0.1.0.csv` file.
Other columns may be present in the input `my_addresses.csv` file, and these other columns will be linked in and included in the output `my_addresses_daymet_0.1.1.csv` file.

### Optional Arguments

Expand All @@ -43,7 +43,7 @@ Other columns may be present in the input `my_addresses.csv` file, and these oth
An example DeGAUSS command with all optional arguments used would be:

```sh
docker run --rm -v $PWD:/tmp ghcr.io/degauss-org/daymet:0.1.0 my_addresses.csv tmax,vp,prcp -88.263390 -87.525706 41.470117 42.154247 na
docker run --rm -v $PWD:/tmp ghcr.io/degauss-org/daymet:0.1.1 my_addresses.csv tmax,vp,prcp -88.263390 -87.525706 41.470117 42.154247 na
```

which will return maximum temperature, vapor pressure, and precipitation for observations within a bounding box of Cook County, IL. It is important to specify bounding box coordinates in the order of: `min_lon`, `max_lon`, `min_lat`, `max_lat`.
Expand Down

0 comments on commit 2c0e029

Please sign in to comment.