Skip to content

Commit 2e039c8

Browse files
authored
Merge pull request #752 from nowooj/chore/latest-gaia
chore: update Dockerfile and build script to support custom bin and lib path
2 parents 3ca28c3 + f9804ea commit 2e039c8

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

starship/docker/chains/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ ARG BASE_IMAGE
22
ARG VERSION
33
FROM ${BASE_IMAGE}:${VERSION} AS source
44

5-
FROM alpine:3.17
5+
FROM alpine:3.22
6+
7+
ARG BIN_PATH=/bin
8+
ARG LIB_PATH=/lib
69

710
LABEL org.opencontainers.image.source="https://github.com/hyperweb-io/starship"
811

9-
COPY --from=source /bin /usr/bin
10-
COPY --from=source /lib /usr/lib
12+
COPY --from=source ${BIN_PATH} /usr/bin
13+
COPY --from=source ${LIB_PATH} /usr/lib
1114

1215
# Set up dependencies
13-
ENV PACKAGES curl make bash jq sed
16+
ENV PACKAGES="curl make bash jq sed"
1417

1518
# Install minimum necessary dependencies
1619
RUN apk add --no-cache $PACKAGES

starship/docker/chains/build-docker-chains.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ build_chain_tag() {
5151

5252
local base=$(yq -r ".chains[] | select(.name==\"$chain\") | .base" versions.yaml)
5353
local dockerfile=$(yq -r ".chains[] | select(.name==\"$chain\") | .file // \"Dockerfile\"" versions.yaml)
54+
local bin_path=$(yq -r ".chains[] | select(.name==\"$chain\") | .bin_path // \"/bin\"" versions.yaml)
55+
local lib_path=$(yq -r ".chains[] | select(.name==\"$chain\") | .lib_path // \"/lib\"" versions.yaml)
5456

5557
if [[ "$FORCE" -ne 1 ]]; then
5658
if image_tag_exists $DOCKER_REPO/$chain $tag; then
@@ -75,6 +77,8 @@ build_chain_tag() {
7577
. -f $dockerfile \
7678
--build-arg BASE_IMAGE=$base \
7779
--build-arg VERSION=$tag \
80+
--build-arg BIN_PATH=$bin_path \
81+
--build-arg LIB_PATH=$lib_path \
7882
$buildx_args && break
7983
color red "failed to build docker image, retrying in 5 seconds, retry: $n"
8084
sleep 5

starship/docker/chains/versions.yaml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@ chains:
99
- v24.0.3
1010
- v23.0.0
1111
- name: gaia
12-
base: ghcr.io/strangelove-ventures/heighliner/gaia
13-
tags:
14-
- v24.0.0
15-
- v23.3.0
16-
- v23.2.0
17-
- v23.1.1
18-
- v21.0.1
19-
- v19.2.0
20-
- v19.1.0
21-
- v18.1.0
22-
- v18.0.0
12+
base: ghcr.io/cosmos/gaia
13+
bin_path: /usr/local/bin
14+
tags:
15+
- v27.0.0
16+
- v26.0.0
17+
- v25.3.2
18+
- v25.2.0
19+
- v25.1.1
2320
- name: stride
2421
base: ghcr.io/strangelove-ventures/heighliner/stride
2522
tags:

0 commit comments

Comments
 (0)