Add compatibility with Openshift

- Change USER options form Dockerfile to use uid

Dockerfile.template

@@ -3,7 +3,8 @@ FROM gcc:11 as compile-stage
 RUN apt update ; \
   apt install cvs -y
 
-RUN useradd opentracker
+RUN useradd farmhand && \
+  usermod -u 6969 farmhand
 
 WORKDIR /usr/src
 
@@ -31,7 +32,7 @@ COPY --from=compile-stage /etc/passwd /etc/passwd
 
 WORKDIR /etc/opentracker
 
-USER opentracker
+USER 6969
 
 EXPOSE 6969/udp
 EXPOSE 6969/tcp

README.md

@@ -96,7 +96,7 @@ All `tags` use default configuration file from [here](https://erdgeist.org/gitwe
 
 Some adjusts are made:
 
-- `tracker.user` is setted to `opentracker` [USER](https://docs.docker.com/engine/reference/builder/#user) in all tags.
+- `tracker.user` is setted to `farmhand` [USER](https://docs.docker.com/engine/reference/builder/#user) in all tags.
 - `access.whitelist` is setted to `/etc/opentracker/whitelist` in `whitelist` tag.
 - `access.blacklist` is setted to `/etc/opentracker/blacklist` in `blacklist` tag.
 

blacklist.Dockerfile

@@ -8,7 +8,8 @@ FROM gcc:11 as compile-stage
 RUN apt update ; \
   apt install cvs -y
 
-RUN useradd opentracker
+RUN useradd farmhand && \
+  usermod -u 6969 farmhand
 
 WORKDIR /usr/src
 
@@ -30,7 +31,7 @@ RUN cd /usr/src/opentracker ; \
   cp -v opentracker.conf.sample /tmp/stage/etc/opentracker/opentracker.conf ; \
       # Opentrack conf blacklist sed expressions
       sed -ri -e '\
-        s!(.*)(tracker.user)(.*)!\2 opentracker!g; \
+        s!(.*)(tracker.user)(.*)!\2 farmhand!g; \
         s!(.*)(access.blacklist)(.*)!\2 /etc/opentracker/blacklist!g; \
       ' /tmp/stage/etc/opentracker/opentracker.conf ; \
       touch /tmp/stage/etc/opentracker/blacklist ; \
@@ -44,7 +45,7 @@ COPY --from=compile-stage /etc/passwd /etc/passwd
 
 WORKDIR /etc/opentracker
 
-USER opentracker
+USER 6969
 
 EXPOSE 6969/udp
 EXPOSE 6969/tcp

open.Dockerfile

@@ -8,7 +8,8 @@ FROM gcc:11 as compile-stage
 RUN apt update ; \
   apt install cvs -y
 
-RUN useradd opentracker
+RUN useradd farmhand && \
+  usermod -u 6969 farmhand
 
 WORKDIR /usr/src
 
@@ -27,7 +28,7 @@ RUN cd /usr/src/opentracker ; \
   cp -v opentracker.conf.sample /tmp/stage/etc/opentracker/opentracker.conf ; \
     # Opentrack conf whitelist sed expressions
     sed -ri -e '\
-      s!(.*)(tracker.user)(.*)!\2 opentracker!g; \
+      s!(.*)(tracker.user)(.*)!\2 farmhand!g; \
     ' /tmp/stage/etc/opentracker/opentracker.conf ; \
   install -m 755 opentracker.debug /tmp/stage/bin ; \
   make DESTDIR=/tmp/stage BINDIR="/bin" install
@@ -39,7 +40,7 @@ COPY --from=compile-stage /etc/passwd /etc/passwd
 
 WORKDIR /etc/opentracker
 
-USER opentracker
+USER 6969
 
 EXPOSE 6969/udp
 EXPOSE 6969/tcp

update.sh

@@ -36,7 +36,7 @@ __EOF__
     cat <<'__EOF__' >/tmp/opentrackerSedExpressions
     # Opentrack conf whitelist sed expressions
     sed -ri -e '\
-      s!(.*)(tracker.user)(.*)!\2 opentracker!g; \
+      s!(.*)(tracker.user)(.*)!\2 farmhand!g; \
     ' /tmp/stage/etc/opentracker/opentracker.conf ; \
 __EOF__
 
@@ -53,7 +53,7 @@ __EOF__
     cat <<'__EOF__' >/tmp/opentrackerSedExpressions
       # Opentrack conf blacklist sed expressions
       sed -ri -e '\
-        s!(.*)(tracker.user)(.*)!\2 opentracker!g; \
+        s!(.*)(tracker.user)(.*)!\2 farmhand!g; \
         s!(.*)(access.blacklist)(.*)!\2 /etc/opentracker/blacklist!g; \
       ' /tmp/stage/etc/opentracker/opentracker.conf ; \
       touch /tmp/stage/etc/opentracker/blacklist ; \
@@ -72,7 +72,7 @@ __EOF__
     cat <<'__EOF__' >/tmp/opentrackerSedExpressions
       # Opentrack conf whitelist sed expressions
       sed -ri -e '\
-        s!(.*)(tracker.user)(.*)!\2 opentracker!g; \
+        s!(.*)(tracker.user)(.*)!\2 farmhand!g; \
         s!(.*)(access.whitelist)(.*)!\2 /etc/opentracker/whitelist!g; \
       ' /tmp/stage/etc/opentracker/opentracker.conf ; \
       touch /tmp/stage/etc/opentracker/whitelist ; \

whitelist.Dockerfile

@@ -8,7 +8,8 @@ FROM gcc:11 as compile-stage
 RUN apt update ; \
   apt install cvs -y
 
-RUN useradd opentracker
+RUN useradd farmhand && \
+  usermod -u 6969 farmhand
 
 WORKDIR /usr/src
 
@@ -30,7 +31,7 @@ RUN cd /usr/src/opentracker ; \
   cp -v opentracker.conf.sample /tmp/stage/etc/opentracker/opentracker.conf ; \
       # Opentrack conf whitelist sed expressions
       sed -ri -e '\
-        s!(.*)(tracker.user)(.*)!\2 opentracker!g; \
+        s!(.*)(tracker.user)(.*)!\2 farmhand!g; \
         s!(.*)(access.whitelist)(.*)!\2 /etc/opentracker/whitelist!g; \
       ' /tmp/stage/etc/opentracker/opentracker.conf ; \
       touch /tmp/stage/etc/opentracker/whitelist ; \
@@ -44,7 +45,7 @@ COPY --from=compile-stage /etc/passwd /etc/passwd
 
 WORKDIR /etc/opentracker
 
-USER opentracker
+USER 6969
 
 EXPOSE 6969/udp
 EXPOSE 6969/tcp