Merge branch 'master' into rew/add-teacache-switch-v17

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## Unreleased
 
 * Add `deploy_cumulus_distribution` variable to cumulus module
+* Update build Dockerfile to create an entry in /etc/passwd for the user building
+  the image.  It allows the `setup_jwt_cookie.sh` script to be run inside the
+  container.
 
 ## v17.0.0.0
 * Upgrade to [Cumulus v17.0.0](https://github.com/nasa/cumulus/releases/tag/v17.0.0)

Dockerfile

@@ -41,6 +41,11 @@ RUN \
         curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/linux_64bit/session-manager-plugin.rpm" -o "session-manager-plugin.rpm" &&\
         yum install -y session-manager-plugin.rpm
 
+# Add user for keygen in Makefile
+ARG USER
+RUN \
+        echo "user:x:${USER}:0:root:/:/bin/bash" >> /etc/passwd
+
 WORKDIR /CIRRUS-core
 
 # Python38 target

Makefile

@@ -48,7 +48,7 @@ endef
 # ---------------------------
 .PHONY: image
 image: Dockerfile
-	docker build -f Dockerfile --no-cache -t cirrus-core:$(DOCKER_TAG) --target $(PYTHON_VER) .
+	docker build -f Dockerfile --no-cache -t cirrus-core:$(DOCKER_TAG) --target $(PYTHON_VER) --build-arg USER=`id -u` .
 
 .PHONY: container-shell
 container-shell: