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

Update to version 1.4.0 #39

Merged
merged 6 commits into from
Jun 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ If you want to get started, see below for a step-by-step guide to using the `RSt

## Using the SITS R Package with RStudio <img src=".github/logo/sits-docker-env-rstudio.png" align="right" width="120"/>

To use the RStudio environment with SITS-enabled, you can run a container from the [brazildatacube/sits-rstudio:1.0.0](https://hub.docker.com/r/brazildatacube/sits-rstudio) image, which is made available on DockerHub. For this, the following command can be used:
To use the RStudio environment with SITS-enabled, you can run a container from the [brazildatacube/sits-rstudio:1.4.0](https://hub.docker.com/r/brazildatacube/sits-rstudio) image, which is made available on DockerHub. For this, the following command can be used:

```shell
docker run --detach \
--publish 127.0.0.1:8787:8787 \
--name my-sits-rstudio \
brazildatacube/sits-rstudio:1.3.0
brazildatacube/sits-rstudio:1.4.0
```

Then, open the URL `http://127.0.0.1:8787` in a web browser:
Expand All @@ -49,13 +49,13 @@ firefox http://127.0.0.1:8787

> In this image, its available the Jupyter Notebook environment together with RStudio.

To use the Jupyter Notebook environment with SITS-enabled, you can run a container from the [brazildatacube/sits-jupyter:1.3.0](https://hub.docker.com/r/brazildatacube/sits-jupyter) image, which is made available on DockerHub. For this, the following command can be used:
To use the Jupyter Notebook environment with SITS-enabled, you can run a container from the [brazildatacube/sits-jupyter:1.4.0](https://hub.docker.com/r/brazildatacube/sits-jupyter) image, which is made available on DockerHub. For this, the following command can be used:

```shell
docker run --detach \
--publish 127.0.0.1:8888:8888 \
--name my-sits-jupyter \
brazildatacube/sits-jupyter:1.3.0
brazildatacube/sits-jupyter:1.4.0
```

After running the above command, it is necessary to recover the Jupyter access token. To do this, use the command below:
Expand All @@ -82,15 +82,16 @@ firefox http://127.0.0.1:8888/?token=d8817e283ad216ef1d920bb5cdd125a1cd104c4374d
To build the images with the Dockerfiles contained in this repository, it is possible to use the `build.sh` utility script. This script presents options for the customization of the images generated for the use of the SITS package. The script has the following options that can be used to customize the generated images:

- `-n`: Build with `--no-cache` flag (Default uses pre-built image cache).
- `-t`: SITS Tag version used in generated image (Default is `1.3.0`).
- `-t`: SITS Tag version used in generated image (Default is `1.4.0`).
- `-p`: Image name prefix (Default is `bdc`).
- `-e`: SITS environment type (`full` or `minimal`. Default is `full`).
- `-h`: show a help message.

Below is an example of using the utility script. The tag name defined for the SITS image is `1.3.0`.
Below is an example of using the utility script. The tag name defined for the SITS image is `1.4.0`.

```shell
./build.sh -n -p brazildatacube -t 1.3.0
./build.sh -n -p brazildatacube -t 1.4.0

```

The above command will create the following images:
Expand All @@ -100,10 +101,9 @@ docker image ls | grep sits
```

```
brazildatacube/sits-jupyter 1.3.0 9d1fe19659e5 3 hours ago 7.12GB
brazildatacube/sits-rstudio 1.3.0 3cea78fefed3 3 hours ago 7.11GB
brazildatacube/sits 1.3.0 3383b933965e 3 hours ago 6.37GB
brazildatacube/sits-r 1.3.0 c17f0fe43f07 3 hours ago 5.82GB
brazildatacube/sits-base 1.3.0 897aca0ceb1d 37 hours ago 3.56GB

brazildatacube/sits-jupyter 1.4.0 4d1bfdb55f8b 2 minutes ago 9.98GB
brazildatacube/sits-rstudio 1.4.0 2cdb7bebcb87 3 minutes ago 9.72GB
brazildatacube/sits 1.4.0 f55999a1dc69 4 minutes ago 8.91GB
brazildatacube/sits-r 1.4.0 37c992e2404b 32 minutes ago 6.36GB
brazildatacube/sits-base 1.4.0 2ef474f5c2fa 7 days ago 3.57GB
```
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ cd docker
# General variables
#
SITS_BUILD_MODE=""
SITS_TAG_VERSION="1.3.0"
SITS_TAG_VERSION="1.4.0"
SITS_TAG_PREFIX="brazildatacube"

SITS_TAG_NOTEBOOKS_REPO="1.1.0"
SITS_NOTEBOOKS_REPO="e-sensing/sitsnotebooks.git"

SITSDATA_COMMIT_REF="43d4a2f4ed319807b7efa657159e1235b8a3b409"
SITSDATA_COMMIT_REF="6da4443d88c7eca88ab3b94d5bdaad3c8b60d223"

SITS_ENVIRONMENT_TYPE="full"

Expand All @@ -30,7 +30,7 @@ SITS_UBUNTU_VERSION="20.04"
# General functions
#
usage() {
echo "Usage: $0 [-n] [-t <1.3.0>] [-p <brazildatacube|registry.dpi.inpe.br>] [-e <full|minimal>]" 1>&2;
echo "Usage: $0 [-n] [-t <${SITS_TAG_VERSION}>] [-p <brazildatacube|registry.dpi.inpe.br>] [-e <full|minimal>]" 1>&2;

exit 1;
}
Expand Down
2 changes: 1 addition & 1 deletion docker/jupyter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This Dockerfile is strongly based on the Dockerfile from Jupyter Stacks,
# see more: github.com/jupyter/docker-stacks
#
ARG BASE_IMAGE=brazildatacube/sits-rstudio:1.3.0
ARG BASE_IMAGE=brazildatacube/sits-rstudio:1.4.0
FROM ${BASE_IMAGE}

#
Expand Down
2 changes: 1 addition & 1 deletion docker/r/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SITS Docker is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.

ARG BASE_IMAGE=brazildatacube/sits-base:1.3.0
ARG BASE_IMAGE=brazildatacube/sits-base:1.4.0
FROM ${BASE_IMAGE}

#
Expand Down
6 changes: 3 additions & 3 deletions docker/rstudio/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SITS Docker is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.

ARG BASE_IMAGE=brazildatacube/sits:1.3.0
ARG BASE_IMAGE=brazildatacube/sits:1.4.0
FROM ${BASE_IMAGE}

#
Expand Down Expand Up @@ -36,8 +36,8 @@ RUN apt-get update -y \
libclang-dev \
&& rm -rf /var/lib/apt/lists/*

ARG RSTUDIO_VERSION=rstudio-server-2023.03.1-446-amd64
RUN wget https://download2.rstudio.org/server/bionic/amd64/${RSTUDIO_VERSION}.deb --no-check-certificate \
ARG RSTUDIO_VERSION=rstudio-server-2023.06.0-421-amd64
RUN wget https://download2.rstudio.org/server/focal/amd64/${RSTUDIO_VERSION}.deb --no-check-certificate \
&& gdebi ${RSTUDIO_VERSION}.deb -n \
&& rm ${RSTUDIO_VERSION}.deb \
&& mkdir -p /var/lib/rstudio-server/monitor/log/ \
Expand Down
2 changes: 1 addition & 1 deletion docker/sits/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SITS Docker is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.

ARG BASE_IMAGE=brazildatacube/sits-r:1.3.0
ARG BASE_IMAGE=brazildatacube/sits-r:1.4.0
FROM ${BASE_IMAGE}

#
Expand Down