Image entrypoint script

Author: nhsdevws

grafana/non-prod/docker/Dockerfile

@@ -16,8 +16,7 @@ RUN echo "Copying dashboard files..."
 COPY ./dashboards /var/lib/grafana/dashboards
 RUN echo "Dashboard files copied."
 
-# Create run.sh
-RUN echo '#!/bin/sh\nexec grafana-server' > /run.sh
+COPY run.sh /run.sh
 RUN chmod +x /run.sh
 
 # Expose Grafana port
@@ -26,4 +25,5 @@ EXPOSE 3000
 # Switch to the non-root user provided by the base image
 USER grafana
 
-CMD ["grafana-server", "--homepath=/usr/share/grafana"]
+ENTRYPOINT ["/run.sh"]
+# CMD ["grafana-server", "--homepath=/usr/share/grafana"]

grafana/non-prod/docker/build_push_to_ecr.sh

@@ -1,5 +1,3 @@
-# docker/build_push_to_ecr.sh
-
 #!/bin/bash
 
 # Set variables
@@ -12,6 +10,8 @@ AWS_REGION="eu-west-2"
 ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
 REPOSITORY_NAME="imms-fhir-api-grafana"
 IMAGE_TAG="11.0.0-22.04_stable"
+LOCAL_IMAGE_NAME="$REPOSITORY_NAME:$IMAGE_TAG"
+IMAGE_NAME="$ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$LOCAL_IMAGE_NAME"
 TAGS="Key=Environment,Value=non-prod Key=Project,Value=immunisation-fhir-api-grafana"
 LIFECYCLE_POLICY_FILE="lifecycle-policy.json"
 
@@ -42,39 +42,23 @@ printf "Building and pushing Docker image to ECR...\n"
 aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
 
 printf "Building Docker image...\n"
-# Build Docker image
-# docker build -t $REPOSITORY_NAME:$IMAGE_TAG .
-# Build Docker image for linux/amd64 architecture
 # Remove existing Docker image if it exists
-docker rmi $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPOSITORY_NAME:$IMAGE_TAG --force
+docker rmi $IMAGE_NAME --force
+
+# Pull the base image for linux/amd64 architecture
 docker pull --platform linux/amd64 grafana/grafana:latest
+
+# Build Docker image for linux/amd64 architecture and push to ECR
 docker buildx create --use
-docker buildx build --platform linux/amd64 -t $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPOSITORY_NAME:$IMAGE_TAG --push .
+docker buildx build --platform linux/amd64 -t $IMAGE_NAME --push .
 
 # Check if the build was successful
 if [ $? -ne 0 ]; then
   echo "Docker build failed."
   exit 1
 fi
 
-printf "Tagging Docker image...\n"
-# Tag Docker image
-docker tag $REPOSITORY_NAME:$IMAGE_TAG $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPOSITORY_NAME:$IMAGE_TAG
-
-# Check if the tag was successful
-if [ $? -ne 0 ]; then
-  echo "Docker tag failed."
-  exit 1
-fi
-
-printf "Pushing Docker image to ECR...\n"
-# Push Docker image to ECR
-docker push $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPOSITORY_NAME:$IMAGE_TAG
-
-# Check if the push was successful
-if [ $? -ne 0 ]; then
-  echo "Docker push failed."
-  exit 1
-fi
+# Inspect the built image
+echo "Image: $LOCAL_IMAGE_NAME"
 
 echo "Docker image built and pushed to ECR successfully."

grafana/non-prod/docker/run.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+echo "Grafana Docker container startup..."
+
+GRAFANA_SERVER_PATH=$(which grafana-server)
+if [ -z "$GRAFANA_SERVER_PATH" ]; then
+    echo "grafana-server not found. Exiting."
+    exit 1
+else
+    echo "grafana-server found at $GRAFANA_SERVER_PATH"
+fi
+
+echo "Starting Grafana with environment variables:"
+env | grep GF_
+
+# Check if Grafana configuration exists
+if [ ! -f /etc/grafana/grafana.ini ]; then
+    echo "Grafana configuration not found. Exiting."
+    exit 1
+fi
+
+which grafana-server
+
+# Start Grafana in the foreground
+echo "Starting Grafana server..."
+exec $GF_PATHS_HOME/bin/grafana-server \
+  --homepath=$GF_PATHS_HOME \
+  --config=/etc/grafana/grafana.ini \
+  --packaging=docker \
+  cfg:default.paths.data=/var/lib/grafana \
+  cfg:default.paths.logs=/var/log/grafana \
+  cfg:default.paths.plugins=/var/lib/grafana/plugins \
+  cfg:default.paths.provisioning=/etc/grafana/provisioning