Skip to content

Commit

Permalink
image updates
Browse files Browse the repository at this point in the history
  • Loading branch information
danbryan committed Jun 19, 2024
1 parent adaac24 commit ea1d3f7
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
- dockerfile: ./osmosisd/Dockerfile
image: ghcr.io/defiantlabs/osmosisd
platforms: linux/amd64
tag: v24.0.1
tag: v25.1.1
- dockerfile: ./kujirad/Dockerfile
image: ghcr.io/defiantlabs/kujirad
platforms: linux/amd64
tag: v1.0.2
- dockerfile: ./odind/Dockerfile
image: ghcr.io/defiantlabs/odind
tag: v0.7.12
tag: v0.8.2
platforms: linux/amd64
permissions:
contents: read
Expand Down
15 changes: 12 additions & 3 deletions kujirad/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG LD_FLAGS=-linkmode=external \
-extldflags '-Wl,-z,muldefs -static'

# Install cli tools for building and final image
RUN apk update && apk add --no-cache make git bash gcc linux-headers eudev-dev ncurses-dev openssh curl jq
RUN apk update && apk add --no-cache make git bash gcc linux-headers eudev-dev ncurses-dev openssh curl jq coreutils
RUN apk add --no-cache musl-dev

# Build Chain Binary
Expand Down Expand Up @@ -74,6 +74,7 @@ COPY --from=build-env /go/bin/price-feeder /bin
COPY --from=build-env /usr/bin/ldd /bin/ldd
COPY --from=build-env /usr/bin/curl /bin/curl
COPY --from=build-env /usr/bin/jq /bin/jq
COPY --from=build-env /usr/bin/tac /bin/tac

# Install Libraries
COPY --from=build-env /usr/lib/libgcc_s.so.1 /lib/
Expand All @@ -82,6 +83,12 @@ COPY --from=build-env /lib/ld-musl*.so.1* /lib
# jq Libraries
COPY --from=build-env /usr/lib/libonig.so.5 /lib

# tac Libraries
COPY --from=build-env /lib/libacl.so* /lib
COPY --from=build-env /lib/libattr.so* /lib
COPY --from=build-env /lib/libutmps.so* /lib
COPY --from=build-env /lib/libskarnet.so* /lib

# curl Libraries
COPY --from=build-env /usr/lib/libcurl.so.4 /lib
COPY --from=build-env /lib/libz.so.1 /lib
Expand All @@ -92,6 +99,9 @@ COPY --from=build-env /lib/libcrypto.so.* /lib
COPY --from=build-env /usr/lib/libbrotlidec.so.1 /lib
COPY --from=build-env /usr/lib/libbrotlicommon.so.1 /lib

# zstd Libraries
COPY --from=build-env /usr/lib/libzstd.so.* /lib

# Install trusted CA certificates for curl
COPY --from=build-env /etc/ssl/cert.pem /etc/ssl/cert.pem
COPY --from=build-env /etc/ssl/cert.pem /etc/ssl/certs/ca-certificates.crt
Expand Down Expand Up @@ -125,12 +135,11 @@ nc \
netstat \
; do ln sh $binary; done


# Copy user
COPY --from=busybox /etc/passwd /etc/passwd
COPY --from=busybox --chown=1137:1137 /home/defiant /home/defiant

# Set home directory and user
WORKDIR /home/defiant
RUN chown -R defiant /home/defiant
USER defiant
USER defiant
2 changes: 1 addition & 1 deletion odind/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG LD_FLAGS=-linkmode=external \

# Install cli tools for building and final image
RUN apt-get update && \
apt-get install -y make git bash gcc linux-headers-amd64 libudev-dev libncurses-dev openssh-client curl jq
apt-get install -y make git bash gcc linux-headers-amd64 libudev-dev libncurses-dev openssh-client curl jq coreutils

# Build
WORKDIR /go/src/github.com/ODIN-PROTOCOL
Expand Down
10 changes: 9 additions & 1 deletion osmosisd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG LD_FLAGS=-linkmode=external \
-extldflags '-Wl,-z,muldefs -static'

# Install cli tools for building and final image
RUN apk add --update --no-cache make git bash gcc linux-headers eudev-dev ncurses-dev openssh curl jq
RUN apk add --update --no-cache make git bash gcc linux-headers eudev-dev ncurses-dev openssh curl jq coreutils
RUN apk add --no-cache musl-dev

# Build
Expand Down Expand Up @@ -59,6 +59,7 @@ COPY --from=build-env /go/bin/osmosisd /bin
COPY --from=build-env /usr/bin/ldd /bin/ldd
COPY --from=build-env /usr/bin/curl /bin/curl
COPY --from=build-env /usr/bin/jq /bin/jq
COPY --from=build-env /usr/bin/tac /bin/tac

# Install Libraries
COPY --from=build-env /usr/lib/libgcc_s.so.1 /lib/
Expand All @@ -67,6 +68,12 @@ COPY --from=build-env /lib/ld-musl*.so.1* /lib
# jq Libraries
COPY --from=build-env /usr/lib/libonig.so.5 /lib

# tac Libraries
COPY --from=build-env /lib/libacl.so* /lib
COPY --from=build-env /lib/libattr.so* /lib
COPY --from=build-env /lib/libutmps.so* /lib
COPY --from=build-env /lib/libskarnet.so* /lib

# curl Libraries
COPY --from=build-env /usr/lib/libcurl.so.4 /lib
COPY --from=build-env /lib/libz.so.1 /lib
Expand All @@ -81,6 +88,7 @@ COPY --from=build-env /etc/ssl/cert.pem /etc/ssl/cert.pem
COPY --from=build-env /etc/ssl/cert.pem /etc/ssl/ca-certificates.crt
COPY --from=build-env /etc/ssl/cert.pem /etc/ssl/certs/ca-certificates.crt


# Install cli tools from busybox
COPY --from=busybox /bin/ln /bin/ln
COPY --from=busybox /bin/ln /bin/sh
Expand Down

0 comments on commit ea1d3f7

Please sign in to comment.