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.

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

Fix non-x64 architectures not being able to build Docker image because of hardcoded Node.js architecture #13081

Merged
merged 2 commits into from
Feb 16, 2020

Conversation

SaraSmiseth
Copy link
Contributor

@SaraSmiseth SaraSmiseth commented Feb 11, 2020

See #13055
This allows building on raspberry pi.

Copy link
Contributor

@shleeable shleeable left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Dockerfile Outdated
@@ -5,14 +5,24 @@ SHELL ["bash", "-c"]

# Install Node v12 (LTS)
ENV NODE_VER="12.14.0"
RUN echo "Etc/UTC" > /etc/localtime && \
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
RUN ARCH= && \
dpkgArch="$(dpkg --print-architecture)" \

Dockerfile Outdated
@@ -5,14 +5,24 @@ SHELL ["bash", "-c"]

# Install Node v12 (LTS)
ENV NODE_VER="12.14.0"
RUN echo "Etc/UTC" > /etc/localtime && \
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the && should go to the line above

@Gargron Gargron changed the title Use ARCH variable instead of hardcoded x64 to download correct version of nodejs Fix non-x64 architectures not being able to build Docker image because of hardcoded Node.js architecture Feb 16, 2020
@Gargron Gargron merged commit 250ca99 into mastodon:master Feb 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants