Only create group inside container when it doesn't exist yet and add wkhtmltopdf

master
Hugo Thunnissen 2 years ago
parent 56e110e22c
commit 297136e0e2

@ -127,7 +127,7 @@ RUN ln -s /opt/sonar-scanner-4.7.0.2747-linux/bin/sonar-scanner /usr/bin/sonar-s
# Protobuf
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install protobuf-compiler
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf
ADD . /opt/workspace-repo
WORKDIR /opt/workspace-repo

@ -76,23 +76,30 @@ func AddUser(username string, uid string) error {
}
func AddGroup(name string, gid string) error {
cmd := exec.Command(
"groupadd",
"--gid", gid,
name,
)
output, err := cmd.CombinedOutput()
_, err := user.LookupGroupId(gid)
if err != nil {
return fmt.Errorf(
"Error adding group: %w. Process error: %w. Process output: %s",
ErrAddGroupFailExit,
err,
output,
)
if _, ok := err.(*user.UnknownGroupError); ok {
cmd := exec.Command(
"groupadd",
"--gid", gid,
name,
)
output, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf(
"Error adding group: %w. Process error: %w. Process output: %s",
ErrAddGroupFailExit,
err,
output,
)
}
return nil
}
}
return nil
return err
}
const osDarwin = "darwin"

Loading…
Cancel
Save