diff --git a/README.md b/README.md index 3fd73ea..c25d7ea 100644 --- a/README.md +++ b/README.md @@ -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 -To use the RStudio environment with SITS-enabled, you can run a container from the [brazildatacube/sits-rstudio:1.4.1](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.2-1](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.4.1 + brazildatacube/sits-rstudio:1.4.2-1 ``` Then, open the URL `http://127.0.0.1:8787` in a web browser: @@ -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.4.1](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.2-1](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.4.1 + brazildatacube/sits-jupyter:1.4.2-1 ``` After running the above command, it is necessary to recover the Jupyter access token. To do this, use the command below: @@ -82,16 +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.4.1`). +- `-t`: SITS Tag version used in generated image (Default is `1.4.2-1`). - `-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.4.1`. +Below is an example of using the utility script. The tag name defined for the SITS image is `1.4.2-1`. ```shell -./build.sh -n -p brazildatacube -t 1.4.1 +./build.sh -n -p brazildatacube -t 1.4.2-1 ``` The above command will create the following images: @@ -101,9 +101,9 @@ docker image ls | grep sits ``` ``` -brazildatacube/sits-jupyter 1.4.1 c84b566b3919 7 days ago 9.82GB -brazildatacube/sits-rstudio 1.4.1 1a5bfbfb0493 7 days ago 9.56GB -brazildatacube/sits 1.4.1 e5a8029eb6c1 7 days ago 8.75GB -brazildatacube/sits-r 1.4.1 f6d54ebcb385 7 days ago 6.2GB -brazildatacube/sits-base 1.4.1 2ef474f5c2fa 7 days ago 3.57GB -``` +brazildatacube/sits-jupyter 1.4.2-1 d98459f7ef48 7 days ago 11.7GB +brazildatacube/sits-rstudio 1.4.2-1 515f7fb93bb1 7 days ago 11.4GB +brazildatacube/sits 1.4.2-1 cb6dc703d49f 7 days ago 10.3GB +brazildatacube/sits-r 1.4.2-1 d935c86bc838 7 days ago 6.52GB +brazildatacube/sits-base 1.4.2-1 2ef474f5c2fa 7 days ago 3.57GB +``` \ No newline at end of file diff --git a/build.sh b/build.sh index efaa280..da0998d 100755 --- a/build.sh +++ b/build.sh @@ -15,13 +15,13 @@ cd docker # SITS_BUILD_MODE="" -SITS_TAG_VERSION="1.4.1" +SITS_TAG_VERSION="1.4.2-1" SITS_TAG_PREFIX="brazildatacube" SITS_TAG_NOTEBOOKS_REPO="1.1.0" SITS_NOTEBOOKS_REPO="e-sensing/sitsnotebooks.git" -SITSDATA_COMMIT_REF="6da4443d88c7eca88ab3b94d5bdaad3c8b60d223" +SITSDATA_COMMIT_REF="271658530f01f0e88d3fa1d76587dd58262f1005" SITS_ENVIRONMENT_TYPE="full" diff --git a/docker/jupyter/Dockerfile b/docker/jupyter/Dockerfile index acb9f3f..3ea32ee 100644 --- a/docker/jupyter/Dockerfile +++ b/docker/jupyter/Dockerfile @@ -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.4.1 +ARG BASE_IMAGE=brazildatacube/sits-rstudio:1.4.2-1 FROM ${BASE_IMAGE} diff --git a/docker/r/Dockerfile b/docker/r/Dockerfile index a739d0b..dda96d5 100644 --- a/docker/r/Dockerfile +++ b/docker/r/Dockerfile @@ -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.4.1 +ARG BASE_IMAGE=brazildatacube/sits-base:1.4.2-1 FROM ${BASE_IMAGE} diff --git a/docker/r/install.R b/docker/r/install.R index 0ea6573..eb45764 100644 --- a/docker/r/install.R +++ b/docker/r/install.R @@ -1,6 +1,6 @@ # # This file is part of SITS Docker. -# Copyright (C) 2022 INPE. +# Copyright (C) 2023 INPE. # # 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. diff --git a/docker/rstudio/Dockerfile b/docker/rstudio/Dockerfile index 1cd1411..f422ee9 100644 --- a/docker/rstudio/Dockerfile +++ b/docker/rstudio/Dockerfile @@ -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.4.1 +ARG BASE_IMAGE=brazildatacube/sits:1.4.2-1 FROM ${BASE_IMAGE} @@ -37,7 +37,8 @@ RUN apt-get update -y \ libclang-dev \ && rm -rf /var/lib/apt/lists/* -ARG RSTUDIO_VERSION=rstudio-server-2023.06.0-421-amd64 +ARG RSTUDIO_VERSION=rstudio-server-2023.09.1-494-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 \ diff --git a/docker/sits/Dockerfile b/docker/sits/Dockerfile index 841d870..df0c1c7 100644 --- a/docker/sits/Dockerfile +++ b/docker/sits/Dockerfile @@ -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.4.1 +ARG BASE_IMAGE=brazildatacube/sits-r:1.4.2-1 FROM ${BASE_IMAGE} diff --git a/docker/sits/install.R b/docker/sits/install.R index 6c5888f..f115114 100644 --- a/docker/sits/install.R +++ b/docker/sits/install.R @@ -1,6 +1,6 @@ # # This file is part of SITS Docker. -# Copyright (C) 2022 INPE. +# Copyright (C) 2023 INPE. # # 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.