Numeric User in Deployer & Changed UID Script to Bash

andrewlecuyer · andrewlecuyer · commit 0d1db0743fd2 · 2020-05-26T10:34:25.000-05:00
The 'uid_daemon.sh' script now uses Bash, while the "daemon" user in
the Deployer Dockerfiles has been updated to use numeric user 2
instead of "daemon".
diff --git a/bin/uid_daemon.sh b/bin/uid_daemon.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/bash
 
 # Copyright 2020 Crunchy Data Solutions, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/centos7/Dockerfile.pgo-deployer.centos7 b/centos7/Dockerfile.pgo-deployer.centos7
@@ -26,6 +26,6 @@ RUN chmod g=u /uid_daemon.sh
 
 ENTRYPOINT ["/uid_daemon.sh"]
 
-USER daemon
+USER 2
 
 CMD ["/pgo-deploy.sh"]
diff --git a/rhel7/Dockerfile.pgo-deployer.rhel7 b/rhel7/Dockerfile.pgo-deployer.rhel7
@@ -26,6 +26,6 @@ RUN chmod g=u /uid_daemon.sh
 
 ENTRYPOINT ["/uid_daemon.sh"]
 
-USER daemon
+USER 2
 
 CMD ["/pgo-deploy.sh"]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+#!/usr/bin/bash`
`2`	`2`
`3`	`3`	`# Copyright 2020 Crunchy Data Solutions, Inc.`
`4`	`4`	`# Licensed under the Apache License, Version 2.0 (the "License");`