Merge pull request #3401 from AlexsLemonade/ark/update-scripts

Update scripts: set platform and system version
AlexsLemonade · Oct 6, 2023 · 1369e34 · 1369e34
2 parents 7ab86ce + e7acc18
commit 1369e34
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 2 deletions.
diff --git a/api/serve.sh b/api/serve.sh
@@ -26,7 +26,8 @@ docker run \
     --add-host=elasticsearch:"$ES_HOST_IP" \
     --env-file api/environments/local \
     --interactive \
+    --platform linux/amd64 \
     --publish 8000:8000 \
     --tty \
-    "$DOCKERHUB_REPO/dr_api_local" \
+    "$DOCKERHUB_REPO/dr_api_local:$SYSTEM_VERSION" \
     python3 manage.py runserver 0.0.0.0:8000 "$@"
diff --git a/api/serve_production.sh b/api/serve_production.sh
@@ -27,6 +27,7 @@ docker run \
     --env-file api/environments/local \
     --interactive \
     --link drdb:postgres \
+    --platform linux/amd64 \
     --publish 8081:8081 \
     --tty \
     --volume "$STATIC_VOLUMES":/tmp/www/static \

diff --git a/foreman/test_survey.sh b/foreman/test_survey.sh
@@ -88,6 +88,7 @@ docker run \
     --env SURVEYOR="$SURVEYOR" \
     --env-file foreman/environments/test \
     --interactive \
+    --platform linux/amd64 \
     --tty \
     --volume "$volume_directory":/home/user/data_store \
     "$DOCKERHUB_REPO/dr_foreman" \

diff --git a/infrastructure/api-configuration/api-server-instance-user-data.tpl.sh b/infrastructure/api-configuration/api-server-instance-user-data.tpl.sh
@@ -149,9 +149,10 @@ docker run \
     --log-opt awslogs-region="${region}" \
     --log-opt awslogs-stream="${log_stream}" \
     --name dr_api \
+    --platform linux/amd64 \
+    --publish 8081:8081 \
     --tty \
     --volume "$STATIC_VOLUMES":/tmp/www/static \
-    --publish 8081:8081 \
     "${dockerhub_repo}/${api_docker_image}" \
     /bin/sh -c "/home/user/collect_and_run_uwsgi.sh"
 

diff --git a/infrastructure/foreman-configuration/foreman-server-instance-user-data.tpl.sh b/infrastructure/foreman-configuration/foreman-server-instance-user-data.tpl.sh
@@ -39,6 +39,7 @@ docker run \\
     --log-opt awslogs-region="${region}" \\
     --log-opt awslogs-stream="log-stream-foreman-${user}-${stage}" \\
     --name dr_foreman \\
+    --platform linux/amd64 \\
     --tty \\
     --volume /tmp:/tmp \\
     "${dockerhub_repo}/${foreman_docker_image}" \\
@@ -64,6 +65,7 @@ docker run \\
     --env DATABASE_USER=${database_user} \\
     --env-file /home/ubuntu/environment \\
     --interactive \\
+    --platform linux/amd64 \\
     --tty \\
     --volume /tmp:/tmp \\
     ${dockerhub_repo}/${foreman_docker_image} \\
@@ -84,6 +86,7 @@ docker run \\
     --env DATABASE_USER=${database_user} \\
     --env-file /home/ubuntu/environment \\
     --interactive \\
+    --platform linux/amd64 \\
     --tty \\
     --volume /tmp:/tmp \\
     ${dockerhub_repo}/dr_\"\$1\" \\
@@ -145,6 +148,7 @@ docker run \
     --log-opt awslogs-region="${region}" \
     --log-opt awslogs-stream="log-stream-foreman-${user}-${stage}" \
     --name job_filler \
+    --platform linux/amd64 \
     --tty \
     --volume /tmp:/tmp \
     "${dockerhub_repo}/${foreman_docker_image}" \

diff --git a/scripts/run_shell.sh b/scripts/run_shell.sh
@@ -32,6 +32,8 @@ fi
 chmod -R a+rwX "$volume_directory"
 
 docker build \
+    --build-arg DOCKERHUB_REPO="$DOCKERHUB_REPO" \
+    --build-arg SYSTEM_VERSION="$SYSTEM_VERSION" \
     --file foreman/dockerfiles/Dockerfile.foreman \
     --tag dr_shell \
     .
@@ -44,6 +46,7 @@ docker run \
     --env AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \
     --env-file foreman/environments/local \
     --interactive \
+    --platform linux/amd64 \
     --tty \
     --volume "$volume_directory":/home/user/data_store \
     --volume /tmp:/tmp \

diff --git a/workers/run_command.sh b/workers/run_command.sh
@@ -62,6 +62,7 @@ docker run \
     --env-file workers/environments/local \
     --interactive \
     --link drdb:postgres \
+    --platform linux/amd64 \
     --tty \
     --volume "$volume_directory":/home/user/data_store \
     "$DOCKERHUB_REPO/dr_$IMAGE" \

diff --git a/workers/run_janitor.sh b/workers/run_janitor.sh
@@ -31,6 +31,7 @@ docker run \
     --interactive \
     --link drdb:postgres \
     --memory 500m \
+    --platform linux/amd64 \
     --tty \
     --volume "$script_directory/volume":/home/user/data_store \
     "$DOCKERHUB_REPO/dr_smasher" \