From dbbfcf0d49c5fe89581cdd970353fffe702c95ee Mon Sep 17 00:00:00 2001
From: Hugo Thunnissen <devel@hugot.nl>
Date: Thu, 2 Jun 2022 20:45:18 +0200
Subject: [PATCH] Update base to ubuntu 22.04

---
 Dockerfile | 44 ++++++++++++++++++++++----------------------
 main.go    |  8 +++++---
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c49735..c611f5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.10
+FROM ubuntu:22.04
 
 RUN yes | unminimize
 
@@ -47,30 +47,30 @@ RUN sed -i 's!static unsigned char sigsegv_stack\[SIGSTKSZ\]!static max_align_t
 RUN make install
 
 RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    libreadline8 bash-completion sudo
+    libreadline8 bash-completion sudo tzdata
 
 RUN apt-get update && apt-get -y install \
-    php8.0-memcached \
+    php8.1-memcached \
     php-redis \
-    php8.0-bcmath \
-    php8.0-bz2 \
-    php8.0-cli \
-    php8.0-common \
-    php8.0-curl \
-    php8.0-gmp \
-    php8.0-intl \
+    php8.1-bcmath \
+    php8.1-bz2 \
+    php8.1-cli \
+    php8.1-common \
+    php8.1-curl \
+    php8.1-gmp \
+    php8.1-intl \
     php-json \
-    php8.0-mbstring \
-    php8.0-mysql \
-    php8.0-odbc \
-    php8.0-opcache \
-    php8.0-pgsql \
-    php8.0-readline \
-    php8.0-tidy \
-    php8.0-xml \
-    php8.0-xsl \
-    php8.0-zip \
-    php8.0-gd \
+    php8.1-mbstring \
+    php8.1-mysql \
+    php8.1-odbc \
+    php8.1-opcache \
+    php8.1-pgsql \
+    php8.1-readline \
+    php8.1-tidy \
+    php8.1-xml \
+    php8.1-xsl \
+    php8.1-zip \
+    php8.1-gd \
     php-bcmath \
     php-apcu \
     php-cli \
@@ -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 wkhtmltopdf
+RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc
 
 ADD . /opt/workspace-repo
 WORKDIR /opt/workspace-repo
diff --git a/main.go b/main.go
index 0a902ab..6a131a7 100644
--- a/main.go
+++ b/main.go
@@ -78,7 +78,7 @@ func AddUser(username string, uid string) error {
 func AddGroup(name string, gid string) error {
 	_, err := user.LookupGroupId(gid)
 	if err != nil {
-		if _, ok := err.(*user.UnknownGroupError); ok {
+		if _, ok := err.(user.UnknownGroupIdError); ok {
 			cmd := exec.Command(
 				"groupadd",
 				"--gid", gid,
@@ -88,7 +88,7 @@ func AddGroup(name string, gid string) error {
 			output, err := cmd.CombinedOutput()
 			if err != nil {
 				return fmt.Errorf(
-					"Error adding group: %w. Process error: %w. Process output: %s",
+					"Error adding group: %w. Process error: %s. Process output: %s",
 					ErrAddGroupFailExit,
 					err,
 					output,
@@ -97,6 +97,8 @@ func AddGroup(name string, gid string) error {
 
 			return nil
 		}
+
+		log.Println(err)
 	}
 
 	return err
@@ -424,7 +426,7 @@ func main() {
 	case "entrypoint":
 		err := EntryPoint(os.Args[2:])
 		if err != nil {
-			fmt.Println("error executing entrypoint command", err)
+			fmt.Println("error executing entrypoint command:", err)
 			os.Exit(1)
 		}