Skip to content

Commit 24e50f1

Browse files
committed
Fix
Test Test Test Test revert entrypoint changes. Test Test Test Test Test Test Test Revert "Test" This reverts commit 6ae4f18. Test Test Test Test
1 parent 6f89090 commit 24e50f1

File tree

5 files changed

+26
-9
lines changed

5 files changed

+26
-9
lines changed

linux/jdk/alpine/src/main/packaging/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:3.21
3+
FROM ${CONTAINER_REGISTRY}alpine
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \
@@ -13,6 +13,8 @@ RUN set -eux; \
1313
dpkg \
1414
sudo \
1515
wget
16+
# Test
17+
RUN update-ca-certificates
1618

1719
# Create unprivileged user for building, see
1820
# https://github.com/hexops/dockerfile#use-a-static-uid-and-gid

linux/jdk/alpine/src/main/packaging/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace
88

99
# Build package and set distributions it supports
1010
cd /home/builder/workspace/packaging
11-
abuild -r -v --no-repo-update
11+
abuild fetch
12+
abuild -r package
1213

1314
arch=$(abuild -A)
1415

linux/jre/alpine/src/main/packaging/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:3.21
3+
FROM ${CONTAINER_REGISTRY}alpine
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \
@@ -9,15 +9,21 @@ RUN set -eux; \
99
alpine-sdk \
1010
bash \
1111
ca-certificates \
12+
doas \
1213
dpkg \
13-
sudo
14+
sudo \
15+
wget
16+
# Test
17+
RUN update-ca-certificates
1418

1519
# Create unprivileged user for building, see
1620
# https://github.com/hexops/dockerfile#use-a-static-uid-and-gid
1721
RUN adduser -D -h /home/builder builder \
1822
&& addgroup builder abuild \
19-
&& echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
23+
&& echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers \
24+
&& echo 'permit builder as root' > /etc/doas.d/doas.conf
2025

26+
# Add GPG key
2127
USER builder
2228
WORKDIR /home/builder
2329
RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \

linux_new/jdk/alpine/src/main/packaging/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:3.21
3+
FROM ${CONTAINER_REGISTRY}alpine
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \
@@ -13,6 +13,8 @@ RUN set -eux; \
1313
dpkg \
1414
sudo \
1515
wget
16+
# Test
17+
RUN update-ca-certificates
1618

1719
# Create unprivileged user for building, see
1820
# https://github.com/hexops/dockerfile#use-a-static-uid-and-gid

linux_new/jre/alpine/src/main/packaging/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:3.21
3+
FROM ${CONTAINER_REGISTRY}alpine
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \
@@ -9,15 +9,21 @@ RUN set -eux; \
99
alpine-sdk \
1010
bash \
1111
ca-certificates \
12+
doas \
1213
dpkg \
13-
sudo
14+
sudo \
15+
wget
16+
# Test
17+
RUN update-ca-certificates
1418

1519
# Create unprivileged user for building, see
1620
# https://github.com/hexops/dockerfile#use-a-static-uid-and-gid
1721
RUN adduser -D -h /home/builder builder \
1822
&& addgroup builder abuild \
19-
&& echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
23+
&& echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers \
24+
&& echo 'permit builder as root' > /etc/doas.d/doas.conf
2025

26+
# Add GPG key
2127
USER builder
2228
WORKDIR /home/builder
2329
RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \

0 commit comments

Comments
 (0)