Skip to content

Commit 7b525cf

Browse files
committed
Possible fix for Docker (amd64 only)
1 parent cc7b815 commit 7b525cf

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ jobs:
189189
uses: docker/build-push-action@v2
190190
with:
191191
context: ./battlefox
192-
# platforms: linux/amd64
193-
platforms: linux/amd64,linux/arm64
192+
platforms: linux/amd64
193+
# platforms: linux/amd64,linux/arm64
194194
file: ./battlefox/Dockerfile.cross-platform
195195
push: true
196196
tags: ${{ secrets.DOCKER_USERNAME }}/battlefox:${{ env.COMMIT_TAG }},${{ secrets.DOCKER_USERNAME }}/battlefox:latest
@@ -202,8 +202,8 @@ jobs:
202202
uses: docker/build-push-action@v2
203203
with:
204204
context: ./battlefox_discord
205-
# platforms: linux/amd64
206-
platforms: linux/amd64,linux/arm64
205+
platforms: linux/amd64
206+
# platforms: linux/amd64,linux/arm64
207207
file: ./battlefox_discord/Dockerfile.cross-platform
208208
push: true
209209
tags: ${{ secrets.DOCKER_USERNAME }}/battlefox_discord:${{ env.COMMIT_TAG }},${{ secrets.DOCKER_USERNAME }}/battlefox_discord:latest

battlefox/Dockerfile.cross-platform

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then export ARCHITECTURE=x86_64-un
1111

1212
RUN tar -xf battlefox.tar.gz
1313

14-
FROM debian:bullseye-slim
14+
FROM frolvlad/alpine-glibc:glibc-2.34
1515

16-
RUN apt-get update && apt-get install -y ca-certificates
16+
# RUN apt-get update && apt-get install -y ca-certificates
1717

1818
WORKDIR /app
1919
COPY --from=downloader /home/curl_user/battlefox .

0 commit comments

Comments
 (0)