Skip to content

Commit db7565b

Browse files
committed
fix: wget for dockerfiles
1 parent 2544528 commit db7565b

3 files changed

Lines changed: 17 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
- uses: actions/setup-go@v5
1111
with:
1212
go-version: "^1.21"
13-
#- run: make test-integration-docker
14-
# name: Run integration tests inside Docker
13+
- run: make test-integration-docker
14+
name: Run integration tests inside Docker
1515
- run: make test
1616
name: Unit tests
1717

Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@ FROM ubuntu:24.04
2121
RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu
2222

2323
RUN apt-get update && apt-get install -y \
24-
ca-certificates \
24+
ca-certificates wget\
2525
&& rm -rf /var/lib/apt/lists/*
2626

27+
RUN ARCH=$(uname -m) && \
28+
if [ "$ARCH" = "x86_64" ]; then YQ_ARCH="amd64"; \
29+
elif [ "$ARCH" = "aarch64" ]; then YQ_ARCH="arm64"; \
30+
else YQ_ARCH="$ARCH"; fi && \
31+
wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${YQ_ARCH} -O /usr/bin/yq && \
32+
chmod +x /usr/bin/yq
33+
2734
# Copy only the built binaries and entrypoint from builder
2835
COPY --from=builder /go/bin/druid* /usr/bin/
2936
COPY --from=builder /entrypoint.sh /entrypoint.sh

Dockerfile.steamcmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ FROM gameservermanagers/steamcmd:ubuntu-24.04
55
COPY --from=base /usr/bin/druid* /usr/bin/
66
COPY --from=base /entrypoint.sh /entrypoint.sh
77

8+
RUN apt-get update && apt-get install -y \
9+
ca-certificates wget\
10+
&& rm -rf /var/lib/apt/lists/*
11+
12+
RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq
13+
RUN chmod +x /usr/bin/yq
14+
815
# Set up user with the same UID/GID
916
ARG UID=1000
1017
ARG GID=1000

0 commit comments

Comments
 (0)