Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove unused build platform variable #4

Merged
merged 1 commit into from
Oct 27, 2023
Merged

remove unused build platform variable #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
Build:
runs-on: ubuntu-latest

timeout-minutes: 30
timeout-minutes: 50

permissions:
contents: read
Expand Down
14 changes: 3 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,11 @@
# https://github.com/goreleaser/goreleaser-cross-toolchains/blob/main/Dockerfile


FROM --platform=$BUILDPLATFORM debian:bullseye as builder
FROM debian:bullseye as builder

LABEL maintainer="Ibrahim Najjar <https://github.com/abjrcode/>"
LABEL "org.opencontainers.image.source"="https://github.com/abjrcode/cross-wails"

# TARGETARCH is set by Docker Buildx
ARG TARGETARCH

ENV DEBIAN_FRONTEND=noninteractive
ARG DPKG_ARCH="amd64 arm64"
ARG CROSSBUILD_ARCH="amd64 arm64"
Expand Down Expand Up @@ -77,7 +74,7 @@ RUN mkdir -p /etc/apt/keyrings && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get -qq update && apt-get -qq install nodejs -y


ARG TARGETARCH
# Install Go
ARG GO_VERSION=1.21.3
RUN wget https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz \
Expand All @@ -98,12 +95,7 @@ ENV CGO_ENABLED=1

# Install Wails
ARG WAILS_VERSION=v2.6.0
RUN if [ "${TARGETARCH}" = "amd64" ]; then \
CC="x86_64-linux-gnu-gcc"; \
else \
CC="aarch64-linux-gnu-gcc"; \
fi; \
GOARCH=${TARGETARCH} CC=${CC} go install github.com/wailsapp/wails/v2/cmd/wails@${WAILS_VERSION}
RUN go install github.com/wailsapp/wails/v2/cmd/wails@${WAILS_VERSION}


ENTRYPOINT [ "/bin/bash" ]