[release] Release v2021.2

.gitlab-ci.yml

@@ -86,7 +86,7 @@ dockerize gg-ce-web:
 
 .docker_setup: &docker_setup
   before_script:
-    - echo Tagging latest image ${CI_REGISTRY_IMAGE}:{VERSION}
+    - echo Docker on ${DOCKER_HOST}
     - TLS_PATH=~/.docker/${DOCKER_HOST}/certs && mkdir -p ${TLS_PATH}
     - echo "${DOCKER_TLS_CA}" > ${TLS_PATH}/ca.pem
     - echo "${DOCKER_TLS_KEY}" > ${TLS_PATH}/key.pem
@@ -106,7 +106,7 @@ tag latest gg-ce-web image:
     - export REGISTRY_IMAGE="${CI_REGISTRY_IMAGE}/${UI_EXPRESS_IMAGE_NAME}"
     - "echo Tagging: ${REGISTRY_IMAGE}:${VERSION} as ${REGISTRY_IMAGE}:latest"
     - ${DOCKER_CMD} login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - ${DOCKER_CMD} pull ${CI_REGISTRY_IMAGE}:${VERSION}
+    - ${DOCKER_CMD} pull ${REGISTRY_IMAGE}:${VERSION}
     - ${DOCKER_CMD} tag ${REGISTRY_IMAGE}:${VERSION} ${REGISTRY_IMAGE}:latest
     - ${DOCKER_CMD} push ${REGISTRY_IMAGE}:latest
     - ${DOCKER_CMD} logout $CI_REGISTRY

README.md

@@ -10,23 +10,9 @@ information on new releases!
 
 # Running GG-CE Web
 
-**GG-CE Web** is available as a Docker image `dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.1`. 
+**GG-CE Web** is available as a Docker image `dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.2`. 
 
-It works best with [GG-CE Server](https://gitlab.croptrust.org/grin-global/grin-global-server) image `dockerhub.croptrust.org/grin-global/grin-global-server:2021.1`.
-
-
-The preview of the next release is available as `dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.2-edge` and
-you should update your copy of the image before **restarting** your container:
-
-```bash
-docker image pull dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.2-edge
-```
-
-**Note:** You can also just run the current *development* version using the `:edge` tag:
-
-```bash
-docker image pull dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:edge
-```
+It works best with [GG-CE Server](https://gitlab.croptrust.org/grin-global/grin-global-server) image `dockerhub.croptrust.org/grin-global/grin-global-server:2021.2`.
 
 The **GG-CE Web** container requires a few configuration options. The options
 are provided as environment variables. You need to note:
@@ -47,7 +33,7 @@ docker run --rm --name 'ggce-web' \
  -p 3000:3000 \
  -e "API_URL=http://GGCE-SERVER:8081" \
  -e "ORIGIN=http://GGCE-WEB:3000" \
- dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.1
+ dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.2
 ```
 
 **Note:** After hitting **Enter** You should immediately seeing log messages on the console. If not, then your command is not valid. Hit `Ctrl + C` and retry.
@@ -86,6 +72,21 @@ Application config {
 }
 ```
 
+# Next release
+
+The preview of the next release is available as `dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.3-edge` and
+you should update your copy of the image before **restarting** your container:
+
+```bash
+docker image pull dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:2021.3-edge
+```
+
+**Note:** You can also just run the current *development* version using the `:edge` tag:
+
+```bash
+docker image pull dockerhub.croptrust.org/grin-global/grin-global-ui/gg-ce-web:edge
+```
+
 
 # Development environment