Merge branch 'security-compliance' into fix-main-to-sc-conflicts

Pipfile

@@ -4,17 +4,17 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [packages]
-confluent-kafka = "*"
-requests = "*"
-app-common-python = "*"
-logstash-formatter = "*"
-watchtower = "*"
-prometheus-client = "*"
+confluent-kafka = "==2.0.2"
+requests = "==2.28.2"
+app-common-python = "==0.2.5"
+logstash-formatter = "==0.5.17"
+watchtower = "==3.0.1"
+prometheus-client = "==0.16.0"
 
 [requires]
 python_version = "3.9"
 
 [dev-packages]
-flake8 = "*"
-pytest = "~=7.2.0"
-pytest-cov = "*"
+flake8 = "==6.0.0"
+pytest = "==7.2.1"
+pytest-cov = "==4.0.0"

build_deploy.sh

@@ -5,6 +5,7 @@ set -exv
 IMAGE_NAME="quay.io/cloudservices/yuptoo"
 IMAGE_TAG=$(git rev-parse --short=7 HEAD)
 ADDITIONAL_TAGS="qa latest"
+SECURITY_COMPLIANCE_TAG="sc-$(date +%Y%m%d)"
 
 if [[ -z "$QUAY_USER" || -z "$QUAY_TOKEN" ]]; then
     echo "QUAY_USER and QUAY_TOKEN must be set"
@@ -23,7 +24,13 @@ docker --config="$DOCKER_CONF" login -u="$RH_REGISTRY_USER" -p="$RH_REGISTRY_TOK
 docker --config="$DOCKER_CONF" build -t "${IMAGE_NAME}:${IMAGE_TAG}" .
 docker --config="$DOCKER_CONF" push "${IMAGE_NAME}:${IMAGE_TAG}"
 
-for ADDITIONAL_TAG in $ADDITIONAL_TAGS; do
-    docker --config="$DOCKER_CONF" tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:${ADDITIONAL_TAG}"
-    docker --config="$DOCKER_CONF" push "${IMAGE_NAME}:${ADDITIONAL_TAG}"
-done
+
+if [[ $GIT_BRANCH == *"security-compliance"* ]]; then
+    docker --config="$DOCKER_CONF" tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:${SECURITY_COMPLIANCE_TAG}"
+    docker --config="$DOCKER_CONF" push "${IMAGE_NAME}:${SECURITY_COMPLIANCE_TAG}"
+else
+    for ADDITIONAL_TAG in $ADDITIONAL_TAGS; do
+        docker --config="$DOCKER_CONF" tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:${ADDITIONAL_TAG}"
+        docker --config="$DOCKER_CONF" push "${IMAGE_NAME}:${ADDITIONAL_TAG}"
+    done
+fi