docker fixes

using bash for scripts move ui base docker to 14 fixing zts local start up Signed-off-by: Abhijeet V <[email protected]>
AthenZ · Jan 6, 2022 · 8e471cb · 8e471cb
1 parent 6435ea2
commit 8e471cb
Show file tree

Hide file tree

Showing 40 changed files with 58 additions and 51 deletions.
diff --git a/docker/Makefile b/docker/Makefile
@@ -53,42 +53,42 @@ deploy-dev:
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/setup-scripts/self-signed-certificates.sh
 	# ZMS
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/setup-scripts/zms-auto-config.sh
-	sh "./deploy-scripts/zms-deploy.sh"
+	./deploy-scripts/zms-deploy.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/deploy-scripts/zms-debug.sh
 	# ZTS
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/setup-scripts/zts-auto-config.sh
-	sh "./deploy-scripts/zts-deploy.sh"
+	./deploy-scripts/zts-deploy.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/deploy-scripts/zts-debug.sh
 
 deploy-local:
 	# generate self-signed certificates
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/self-signed-certificates.sh
 	# ZMS
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zms-auto-config.sh
-	sh "./deploy-scripts/zms-deploy-local.sh"
+	./deploy-scripts/zms-deploy-local.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/deploy-scripts/zms-debug.sh
 	# ZTS
-	sh "./amazon-trust.sh"
+	./amazon-trust.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zts-auto-config.sh
-	sh "./deploy-scripts/zts-deploy-local.sh"
+	./deploy-scripts/zts-deploy-local.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/deploy-scripts/zts-debug.sh
 	# UI
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/ui-auto-config.sh
-	sh "./deploy-scripts/ui-deploy-local.sh"
+	./deploy-scripts/ui-deploy-local.sh
 
 prepare-ui-dev-env:
 	# generate self-signed certificates
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/self-signed-certificates.sh
 	# ZMS
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zms-auto-config.sh
-	sh "./deploy-scripts/zms-deploy-local.sh"
+	./deploy-scripts/zms-deploy-local.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/deploy-scripts/zms-debug.sh
 	# ZTS
-	sh "./amazon-trust.sh"
+	./amazon-trust.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zts-auto-config.sh
 	# UI defaults
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/ui-auto-config.sh
-	sh "./prepare-local-ui-dev-env.sh"
+	./prepare-local-ui-dev-env.sh
 
 verify:
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/deploy-scripts/zms-verify.sh

diff --git a/docker/amazon-trust.sh b/docker/amazon-trust.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 if test -e /etc/pki/tls/certs/ca-bundle.crt; then
   BASE_DIR=$(git rev-parse --show-toplevel)

diff --git a/docker/deploy-scripts/acceptance-test-reset.sh b/docker/deploy-scripts/acceptance-test-reset.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/acceptance-test.sh b/docker/deploy-scripts/acceptance-test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/common/wait-for-mysql/wait-for-mysql.sh b/docker/deploy-scripts/common/wait-for-mysql/wait-for-mysql.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 

diff --git a/docker/deploy-scripts/ui-deploy-local.sh b/docker/deploy-scripts/ui-deploy-local.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/zms-debug.sh b/docker/deploy-scripts/zms-debug.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/zms-deploy-local.sh b/docker/deploy-scripts/zms-deploy-local.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/zms-deploy.sh b/docker/deploy-scripts/zms-deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/zms-verify.sh b/docker/deploy-scripts/zms-verify.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/zts-debug.sh b/docker/deploy-scripts/zts-debug.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/zts-deploy-local.sh b/docker/deploy-scripts/zts-deploy-local.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
@@ -80,7 +80,7 @@ docker exec --user mysql:mysql \
     "${ZTS_DB_HOST}" mysql \
     --database=zts_store \
     --user=root --password="${ZTS_DB_ROOT_PASS}" \
-    --execute="CREATE USER 'zts_admin'@'${ZTS_HOST}.${DOCKER_NETWORK}' IDENTIFIED BY '${ZTS_DB_ADMIN_PASS}'; GRANT ALL PRIVILEGES ON zts_store.* TO 'zts_admin'@'${ZTS_HOST}.${DOCKER_NETWORK}'; FLUSH PRIVILEGES;"
+    --execute="CREATE USER 'zts_admin'@'%' IDENTIFIED BY '${ZTS_DB_ADMIN_PASS}'; GRANT ALL PRIVILEGES ON zts_store.* TO 'zts_admin'@'%'; FLUSH PRIVILEGES;"
 docker exec --user mysql:mysql \
     "${ZTS_DB_HOST}" mysql \
     --database=mysql \

diff --git a/docker/deploy-scripts/zts-deploy.sh b/docker/deploy-scripts/zts-deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/deploy-scripts/zts-verify.sh b/docker/deploy-scripts/zts-verify.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/docs/cast/bootstrap-demo-welcome-script.sh b/docker/docs/cast/bootstrap-demo-welcome-script.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail

diff --git a/docker/env.sh b/docker/env.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail

diff --git a/docker/local-nameserver.sh b/docker/local-nameserver.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 nameservers=$( grep -v '^#' < /etc/resolv.conf | grep nameserver | awk '{print $2}')
 LOCAL_ENV_NS=""

diff --git a/docker/prepare-local-ui-dev-env.sh b/docker/prepare-local-ui-dev-env.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 BASE_DIR=$(git rev-parse --show-toplevel)
 cp ${BASE_DIR}/docker/ui/var/keys/*.pem ${BASE_DIR}/ui/keys

diff --git a/docker/sample/CAs/create-self-signed-ca.sh b/docker/sample/CAs/create-self-signed-ca.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/sample/domain-admin/create-self-signed-user-cert.sh b/docker/sample/domain-admin/create-self-signed-user-cert.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/sample/env.dev.sh b/docker/sample/env.dev.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail

diff --git a/docker/sample/ui/create-self-signed-certs.sh b/docker/sample/ui/create-self-signed-certs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/sample/zms/create-self-signed-certs.sh b/docker/sample/zms/create-self-signed-certs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/sample/zts/create-self-signed-certs.sh b/docker/sample/zts/create-self-signed-certs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/setup-scripts/common/color-print.sh b/docker/setup-scripts/common/color-print.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail

diff --git a/docker/setup-scripts/sample-identity.sh b/docker/setup-scripts/sample-identity.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # to setup-scripts directory
 cd "$(dirname "$0")"

diff --git a/docker/setup-scripts/self-signed-certificates.sh b/docker/setup-scripts/self-signed-certificates.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/setup-scripts/ui-auto-config.sh b/docker/setup-scripts/ui-auto-config.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/setup-scripts/zms-auto-config.sh b/docker/setup-scripts/zms-auto-config.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/setup-scripts/zts-auto-config.sh b/docker/setup-scripts/zts-auto-config.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.16.2-alpine AS builder
+FROM node:fermium-alpine AS builder
 
 RUN set -eux && apk update && apk add --no-cache --update ca-certificates libstdc++ libgcc tini make git
 
@@ -26,7 +26,7 @@ RUN rm -rf scripts \
     && rm -rf pom.xml \
     && rm -rf README.md
 
-FROM node:12.16.2-alpine
+FROM node:fermium-alpine
 # date -u +'%Y-%m-%dT%H:%M:%SZ'
 ARG BUILD_DATE
 # git rev-parse --short HEAD
@@ -43,9 +43,10 @@ LABEL org.label-schema.vcs-ref=$VCS_REF
 ARG GID=1001
 ARG UID=10001
 
+RUN mkdir -p /var/lib/sia/tokens/msd-api-access && touch /var/lib/sia/tokens/msd-api-access/msd-api-access-token
 # add athenz user
 RUN addgroup -g ${GID} athenz && \
-  adduser -S -D -H -s /sbin/nologin -u ${UID} -G athenz athenz
+  adduser -S -D -H -s /sbin/nologin -u ${UID} -G athenz athenz && chown -R athenz:athenz /var/lib/sia/tokens/msd-api-access
 USER athenz
 
 WORKDIR /opt/athenz/ui

diff --git a/docker/zms/docker-entrypoint.sh b/docker/zms/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 ZMS_STOP_TIMEOUT=${ZMS_STOP_TIMEOUT:-30}
 ZMS_CLASSPATH="${CLASSPATH}:${USER_CLASSPATH}"
@@ -12,7 +12,6 @@ JAVA_OPTS="${JAVA_OPTS} -Dathenz.zms.jdbc_password=${ZMS_DB_ADMIN_PASS}"
 JAVA_OPTS="${JAVA_OPTS} -Dathenz.zms.jdbc_ro_password=${ZMS_RODB_ADMIN_PASS}"
 JAVA_OPTS="${JAVA_OPTS} -Dathenz.ssl_key_store_password=${ZMS_KEYSTORE_PASS}"
 JAVA_OPTS="${JAVA_OPTS} -Dathenz.ssl_trust_store_password=${ZMS_TRUSTSTORE_PASS}"
-JAVA_OPTS="${JAVA_OPTS} -Djava.io.tmpdir=/tmp"
 
 ### !!! P.S. cannot quote JAVA_OPTS !!!
 ### reference: https://github.com/koalaman/shellcheck/wiki/SC2086

diff --git a/docker/zts/conf/athenz.properties b/docker/zts/conf/athenz.properties
@@ -126,3 +126,6 @@ athenz.graceful_shutdown=true
 # How long to wait for the Jetty server to shutdown, in milliseconds
 # If the athenz.graceful_shutdown is not true, this setting is invalid.
 athenz.graceful_shutdown_timeout=30000
+
+# Need this to start root-less container
+athenz.jetty_temp=/tmp
diff --git a/docker/zts/docker-entrypoint.sh b/docker/zts/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 ZTS_STOP_TIMEOUT=${ZTS_STOP_TIMEOUT:-30}
 ZTS_CLASSPATH="${CLASSPATH}:${USER_CLASSPATH}"

diff --git a/docs/local_ui_development.md b/docs/local_ui_development.md
@@ -3,7 +3,7 @@ In this guide, you will be able to start a local ZMS server and do local ui deve
 
 ## Prerequisites
 
-Docker, Make toolchain, Node v12.14.0, nodemon v2.0.3
+Docker, Make toolchain, Node v14.x, nodemon v2.x
 
 ## Steps
 

diff --git a/servers/zms/scripts/setup_dev_zms.sh b/servers/zms/scripts/setup_dev_zms.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Determine our run-time directory
 

diff --git a/servers/zts/scripts/setup_dev_zts.sh b/servers/zts/scripts/setup_dev_zts.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Determine our run-time directory
 

diff --git a/start-local-athenz.sh b/start-local-athenz.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/stop-local-athenz.sh b/stop-local-athenz.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail

diff --git a/ui/scripts/setup_dev_ui.sh b/ui/scripts/setup_dev_ui.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Determine our run-time directory
 
@@ -69,4 +69,8 @@ elif [ "$HOST_PLATFORM" == 'darwin' ] ; then
   cat /dev/urandom | env LC_CTYPE=C tr -dc a-zA-Z0-9 | head -c 16 > "$ROOT"/keys/cookie-session
 fi
 
+echo "Creating a dummy token file"
+sudo mkdir -p /var/lib/sia/tokens/msd-api-access/ && sudo chown -R "$(id -u)":"$(id -g)" /var/lib/sia/tokens/msd-api-access
+touch /var/lib/sia/tokens/msd-api-access/msd-api-access-token
+
 echo "Athenz UI Dev Environment setup complete"