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

Changes for development on M1 Macs #1494

Merged
merged 6 commits into from
Feb 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
build:
context: .
dockerfile: ./docker/Dockerfile
image: h2o-python:0.59
image: h2o-python:0.60
tty: true
command: bash
environment:
Expand Down
9 changes: 4 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ ENV LANG=C.UTF-8 \

RUN apt-get update && apt-get install -y nano postgresql-client

ARG BUILDARCH
rebeccacremona marked this conversation as resolved.
Show resolved Hide resolved
ENV BUILDARCH=${BUILDARCH:-amd64}

# pin node version -- see https://github.com/nodesource/distributions/issues/33
RUN curl -o nodejs.deb https://deb.nodesource.com/node_12.x/pool/main/n/nodejs/nodejs_12.13.1-1nodesource1_amd64.deb \
RUN curl -o nodejs.deb https://deb.nodesource.com/node_12.x/pool/main/n/nodejs/nodejs_12.13.1-1nodesource1_${BUILDARCH}.deb \
&& dpkg -i ./nodejs.deb \
&& rm nodejs.deb

# Install Pandoc, for export
RUN wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-amd64.deb \
&& dpkg -i pandoc-2.14.2-1-amd64.deb

RUN mkdir -p /app/web
WORKDIR /app/web

Expand Down
7 changes: 5 additions & 2 deletions docker/pandoc-lambda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ COPY entrypoint.sh /
RUN chmod 755 /usr/local/bin/aws-lambda-rie /entrypoint.sh
EXPOSE 8080

ARG BUILDARCH
ENV BUILDARCH=${BUILDARCH:-amd64}

# Install Pandoc
RUN wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-amd64.deb \
&& dpkg -i pandoc-2.14.2-1-amd64.deb
RUN wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-${BUILDARCH}.deb \
&& dpkg -i pandoc-2.14.2-1-${BUILDARCH}.deb

# Install the python requirements, including the AWS Lambda runtime interface client
COPY function/requirements.txt .
Expand Down