Move Docker scripts to be consistent with other METplus components (#…

…1907)

.github/jobs/create_output_data_volumes.sh

@@ -28,7 +28,7 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-docker_data_output_dir=scripts/docker/docker_data_output
+docker_data_output_dir=.github/jobs/docker_data_output
 
 success=1
 for vol_name in use_cases_*; do

.github/jobs/docker_setup.sh

@@ -29,9 +29,9 @@ duration=$(( SECONDS - start_seconds ))
 echo "TIMING: docker pull ${DOCKERHUB_TAG} took `printf '%02d' $(($duration / 60))`:`printf '%02d' $(($duration % 60))` (MM:SS)"
 
 # set DOCKERFILE_PATH that is used by docker hook script get_met_version
-export DOCKERFILE_PATH=${GITHUB_WORKSPACE}/scripts/docker/Dockerfile
+export DOCKERFILE_PATH=${GITHUB_WORKSPACE}/internal/scripts/docker/Dockerfile
 
-MET_TAG=`${GITHUB_WORKSPACE}/scripts/docker/hooks/get_met_version`
+MET_TAG=`${GITHUB_WORKSPACE}/internal/scripts/docker/hooks/get_met_version`
 
 MET_DOCKER_REPO=met-dev
 if [ "${MET_TAG}" != "develop" ]; then

docs/Contributors_Guide/continuous_integration.rst

@@ -685,7 +685,7 @@ images using Conda that can be used to run use cases. These images are stored
 on DockerHub in *dtcenter/metplus-envs* and are named with a tag that
 corresponds to the keyword without the **_env** suffix.
 The environments were created using Docker commands via scripts that are found
-in *scripts/docker/docker_env*.
+in *internal/scripts/docker_env*.
 Existing keywords that set up Conda environments used for use cases are:
 
 * cfgrib_env
@@ -793,14 +793,14 @@ packages take a very long time to install in Docker. The new approach involves
 creating Docker images that use Conda to create a Python environment that can
 run the use case. To see what is available in each of the existing Python
 environments, refer to the comments in the scripts found in
-*scripts/docker/docker_env/scripts*.
+*internal/scripts/docker_env/scripts*.
 New environments must be added by a METplus developer,
 so please create a discussion on the
 `METplus GitHub Discussions <https://met.readthedocs.io/en/latest/Users_Guide/appendixF.html>`_
 forum if none of these environments contain the package requirements
 needed to run a new use case.
 
-A **README.md** file can be found in *scripts/docker/docker_env* that
+A **README.md** file can be found in *internal/scripts/docker_env* that
 provides commands that can be run to recreate a Docker image if the
 conda environment needs to be updated. Please note that Docker must
 be installed on the workstation used to create new Docker images and

docs/Users_Guide/installation.rst

@@ -221,16 +221,11 @@ The METplus Wrappers source code contains the following directory structure::
   METplus/
     build_components/
     docs/
-    environment.yml
     internal/
     manage_exernals/
     metplus/
     parm/
     produtil/
-    README.md
-    requirements.txt
-    scripts/
-    setup.py
     ush/
 
 The top-level METplus Wrappers directory consists of a README.md file
@@ -249,7 +244,8 @@ The Doxygen documentation is useful to
 contributors and is not necessary for METplus end-users.
 
 The **internal/** directory contains scripts that are only
-relevant to METplus developers and contributors.
+relevant to METplus developers and contributors, such as tests and files
+used with Docker.
 
 The **manage_externals/** directory contains scripts used to
 facilitate the downloading and management
@@ -262,9 +258,6 @@ METplus Wrappers.
 
 The **produtil/** directory contains part of the external utility produtil.
 
-The **scripts/** directory contains scripts that are used for creating
-Docker images.
-
 The **ush/** directory contains the run_metplus.py script that is
 executed to run use cases.
 

scripts/docker/hooks/get_met_version → internal/scripts/docker/hooks/get_met_version

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # get version, use develop or X+6.Y for MET_BRANCH
-version_file=$(dirname $DOCKERFILE_PATH)/../../metplus/VERSION
+version_file=$(dirname $DOCKERFILE_PATH)/../../../metplus/VERSION
 
 if cat $version_file | egrep -q '^[0-9.]+$'; then
   let major=$(cut -d '.' -f1 $version_file)+6

scripts/docker/docker_env/README.md → internal/scripts/docker_env/README.md

@@ -1,6 +1,6 @@
 # Docker Conda Environments
 
-Run the commands from this directory (scripts/docker/docker_env).
+Run the commands from this directory (internal/scripts/docker_env).
 Instructions include how to create Docker images in dtcenter/metplus-envs so
 environments are available for the automated tests. Instructions to create
 these Conda environments on a local machine are also provided.