Skip to content

Commit 2c88c48

Browse files
tjwatsontjwatson
authored
Merge pull request #514 from tjwatson/useUserAddUbuntu
Fix ubuntu image build issues
2 parents 9531d83 + a719f50 commit 2c88c48

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

‎ga/23.0.0.6/images.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
websphere-liberty:23.0.0.3-kernel ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8
2-
websphere-liberty:23.0.0.3-kernel-java11-openj9 ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11
3-
websphere-liberty:23.0.0.3-kernel-java17-openj9 ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17
4-
websphere-liberty:23.0.0.3-kernel-java8-ibmjava-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8
5-
websphere-liberty:23.0.0.3-kernel-java8-openj9-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8
6-
websphere-liberty:23.0.0.3-kernel-java11-openj9-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11
7-
websphere-liberty:23.0.0.3-kernel-java17-openj9-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17
8-
websphere-liberty:23.0.0.3-full ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubuntu.ibmjava8
9-
websphere-liberty:23.0.0.3-full-java11-openj9 ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk11
10-
websphere-liberty:23.0.0.3-full-java17-openj9 ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk17
11-
websphere-liberty:23.0.0.3-full-java8-ibmjava-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubi.ibmjava8
12-
websphere-liberty:23.0.0.3-full-java8-openj9-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubi.openjdk8
13-
websphere-liberty:23.0.0.3-full-java11-openj9-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubi.openjdk11
14-
websphere-liberty:23.0.0.3-full-java17-openj9-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubi.openjdk17
1+
websphere-liberty:23.0.0.6-kernel ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
2+
websphere-liberty:23.0.0.6-kernel-java11-openj9 ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
3+
websphere-liberty:23.0.0.6-kernel-java17-openj9 ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
4+
websphere-liberty:23.0.0.6-kernel-java8-ibmjava-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8
5+
websphere-liberty:23.0.0.6-kernel-java8-openj9-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk8
6+
websphere-liberty:23.0.0.6-kernel-java11-openj9-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk11
7+
websphere-liberty:23.0.0.6-kernel-java17-openj9-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk17
8+
websphere-liberty:23.0.0.6-full ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
9+
websphere-liberty:23.0.0.6-full-java11-openj9 ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
10+
websphere-liberty:23.0.0.6-full-java17-openj9 ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
11+
websphere-liberty:23.0.0.6-full-java8-ibmjava-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8
12+
websphere-liberty:23.0.0.6-full-java8-openj9-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.openjdk8
13+
websphere-liberty:23.0.0.6-full-java11-openj9-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.openjdk11
14+
websphere-liberty:23.0.0.6-full-java17-openj9-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.openjdk17
1515
websphere-liberty:beta ../beta
1616
websphere-liberty:test-stock-quote test-stock-quote
1717
websphere-liberty:test-stock-trader test-stock-trader

‎ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RUN set -eux; \
9999
rm -rf /var/lib/apt/lists/*;
100100

101101
# Add default user 1001 and create wlp with right user/permissions before copying
102-
RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
102+
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
103103
&& mkdir -p /opt/ibm/wlp \
104104
&& chown -R 1001:0 /opt/ibm/wlp \
105105
&& chmod -R g+rw /opt/ibm/wlp

‎ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ RUN set -eux; \
9595
chmod +x /usr/bin/dumb-init;
9696

9797
# Add default user 1001 and create wlp with right user/permissions before copying
98-
RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
98+
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
9999
&& mkdir -p /opt/ibm/wlp \
100100
&& chown -R 1001:0 /opt/ibm/wlp \
101101
&& chmod -R g+rw /opt/ibm/wlp

‎ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ RUN set -eux; \
9595
chmod +x /usr/bin/dumb-init;
9696

9797
# Add default user 1001 and create wlp with right user/permissions before copying
98-
RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
98+
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
9999
&& mkdir -p /opt/ibm/wlp \
100100
&& chown -R 1001:0 /opt/ibm/wlp \
101101
&& chmod -R g+rw /opt/ibm/wlp

‎ga/latest/kernel/Dockerfile.ubuntu.ibmjava8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RUN set -eux; \
9999
rm -rf /var/lib/apt/lists/*;
100100

101101
# Add default user 1001 and create wlp with right user/permissions before copying
102-
RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
102+
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
103103
&& mkdir -p /opt/ibm/wlp \
104104
&& chown -R 1001:0 /opt/ibm/wlp \
105105
&& chmod -R g+rw /opt/ibm/wlp

‎ga/latest/kernel/Dockerfile.ubuntu.openjdk11‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ RUN set -eux; \
9595
chmod +x /usr/bin/dumb-init;
9696

9797
# Add default user 1001 and create wlp with right user/permissions before copying
98-
RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
98+
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
9999
&& mkdir -p /opt/ibm/wlp \
100100
&& chown -R 1001:0 /opt/ibm/wlp \
101101
&& chmod -R g+rw /opt/ibm/wlp

‎ga/latest/kernel/Dockerfile.ubuntu.openjdk17‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ RUN set -eux; \
9595
chmod +x /usr/bin/dumb-init;
9696

9797
# Add default user 1001 and create wlp with right user/permissions before copying
98-
RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
98+
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
9999
&& mkdir -p /opt/ibm/wlp \
100100
&& chown -R 1001:0 /opt/ibm/wlp \
101101
&& chmod -R g+rw /opt/ibm/wlp

0 commit comments

Comments
 (0)