Skip to content

Commit

Permalink
change LABELS, Versions for dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@felichita
felichita committed Jun 17, 2024
1 parent 29ef3c7 commit 083c30a
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 32 deletions.
8 changes: 4 additions & 4 deletions dockerfile/avalanche/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ RUN bash -c 'set -eux;\
LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done'

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.4 AS infra-toolkit
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
Expand All @@ -113,7 +113,7 @@ FROM alpine:3 as alpine-3
# Build final image from scratch
FROM scratch

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

WORKDIR /bin

Expand Down Expand Up @@ -168,8 +168,8 @@ COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem

# Install heighliner user
COPY --from=infra-toolkit /etc/passwd /etc/passwd
COPY --from=infra-toolkit --chown=1025:1025 /home/p2p /home/p2p
COPY --from=infra-toolkit --chown=1025:1025 /home/p2p /tmp
COPY --from=infra-toolkit --chown=1111:1111 /home/p2p /home/p2p
COPY --from=infra-toolkit --chown=1111:1111 /home/p2p /tmp

WORKDIR /home/p2p
USER p2p
4 changes: 2 additions & 2 deletions dockerfile/avalanche/native.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RUN bash -c 'set -eux;\
LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done'

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.4 AS infra-toolkit
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
Expand All @@ -90,7 +90,7 @@ FROM alpine:3 as alpine-3
# Build final image from scratch
FROM scratch

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

WORKDIR /bin

Expand Down
4 changes: 2 additions & 2 deletions dockerfile/cargo/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ RUN bash -c 'set -eux;\
done'

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.6 AS infra-toolkit
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
Expand Down Expand Up @@ -222,7 +222,7 @@ RUN bash -c 'set -eux;\
# Build final image from scratch
FROM scratch

LABEL org.opencontainers.image.source="https://github.com/p2p/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p/cosmos-heighliner"

WORKDIR /bin

Expand Down
12 changes: 6 additions & 6 deletions dockerfile/cargo/native.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ RUN bash -c 'set -eux;\
done'

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.4 AS infra-toolkit
RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
FROM busybox:1.34.1-musl AS busybox-full
Expand All @@ -172,7 +172,7 @@ FROM alpine:3 as alpine-3
# Build final image from scratch
FROM scratch

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

WORKDIR /bin

Expand Down Expand Up @@ -258,7 +258,7 @@ COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem

# Install heighliner user
COPY --from=infra-toolkit /etc/passwd /etc/passwd
COPY --from=infra-toolkit --chown=1025:1025 /home/heighliner /home/heighliner
COPY --from=infra-toolkit --chown=1111:1111 /home/p2p /home/p2p

WORKDIR /home/heighliner
USER heighliner
WORKDIR /home/p2p
USER p2p
8 changes: 4 additions & 4 deletions dockerfile/cosmos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ RUN bash -c 'set -eux;\
LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done'

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.6 AS infra-toolkit
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
Expand All @@ -131,7 +131,7 @@ FROM alpine:3 as alpine-3
# Build final image from scratch
FROM scratch

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

WORKDIR /bin

Expand Down Expand Up @@ -186,8 +186,8 @@ COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem

# Install heighliner user
COPY --from=infra-toolkit /etc/passwd /etc/passwd
COPY --from=infra-toolkit --chown=1025:1025 /home/p2p /home/p2p
COPY --from=infra-toolkit --chown=1025:1025 /tmp /tmp
COPY --from=infra-toolkit --chown=1111:1111 /home/p2p /home/p2p
COPY --from=infra-toolkit --chown=1111:1111 /tmp /tmp

WORKDIR /home/p2p
USER p2p
16 changes: 8 additions & 8 deletions dockerfile/cosmos/local.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN set -eux; \
fi;

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.4 AS infra-toolkit
RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
FROM busybox:1.34.1-musl AS busybox-full
Expand All @@ -45,7 +45,7 @@ FROM alpine:3 as alpine-3
# Build part 1 of the final image
FROM scratch AS final-part1

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

WORKDIR /bin

Expand Down Expand Up @@ -92,10 +92,10 @@ RUN rm ln rm
# Install trusted CA certificates
COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem

# Install heighliner user
# Install p2p user
COPY --from=infra-toolkit /etc/passwd /etc/passwd
COPY --from=infra-toolkit --chown=1025:1025 /home/heighliner /home/heighliner
COPY --from=infra-toolkit --chown=1025:1025 /tmp /tmp
COPY --from=infra-toolkit --chown=1111:1111 /home/p2p /home/p2p
COPY --from=infra-toolkit --chown=1111:1111 /tmp /tmp

# Install chain binary
FROM init-env AS build-env
Expand Down Expand Up @@ -170,5 +170,5 @@ COPY --from=build-env /root/bin /bin
# Install libraries
COPY --from=build-env /root/lib /lib

WORKDIR /home/heighliner
USER heighliner
WORKDIR /home/p2p
USER p2p
2 changes: 1 addition & 1 deletion dockerfile/cosmos/localcross.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ RUN bash -c 'set -eux;\
LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done'

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.6 AS infra-toolkit
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
Expand Down
4 changes: 2 additions & 2 deletions dockerfile/cosmos/native.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RUN bash -c 'set -eux;\
LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done'

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.6 AS infra-toolkit
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
Expand All @@ -105,7 +105,7 @@ FROM alpine:3 as alpine-3
# Build final image from scratch
FROM scratch

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

WORKDIR /bin

Expand Down
4 changes: 2 additions & 2 deletions dockerfile/imported/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG VERSION
FROM $BASE_IMAGE:$VERSION AS imported

# Use minimal busybox from infra-toolkit image for final scratch image
FROM ghcr.io/p2p-org/infra-toolkit:v0.1.6 AS infra-toolkit
FROM ghcr.io/p2p-org/cosmos-infra-toolkit:v0.1.6 AS infra-toolkit
RUN addgroup --gid 1111 -S p2p && adduser --uid 1111 -S p2p -G p2p

# Use ln and rm from full featured busybox for assembling final image
Expand Down Expand Up @@ -123,7 +123,7 @@ RUN bash -c 'set -eux;\
# Build final image from scratch
FROM scratch

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

WORKDIR /bin

Expand Down
2 changes: 1 addition & 1 deletion dockerfile/none/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN bash -c 'LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}

FROM debian:bullseye

LABEL org.opencontainers.image.source="https://github.com/p2p-org/heighliner"
LABEL org.opencontainers.image.source="https://github.com/p2p-org/cosmos-heighliner"

# Install binaries
COPY --from=build-env /root/bin /usr/bin
Expand Down

0 comments on commit 083c30a

Please sign in to comment.