From da69bd960642b17588d3a8cbb8494129742d08c5 Mon Sep 17 00:00:00 2001 From: Daniel Simmons-Ritchie Date: Fri, 4 Mar 2022 13:31:13 -0600 Subject: [PATCH 1/3] Fix docker build issue --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 430e07b..2836a4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,6 @@ -FROM node:12-alpine +FROM node:12 LABEL maintainer="Texas Tribune " -# add bash for dev -RUN apk add --no-cache bash - RUN mkdir /app WORKDIR /app From e9b0b7b3bf64d1ff3f2abfcc8d50f1d8618dc761 Mon Sep 17 00:00:00 2001 From: Daniel Simmons-Ritchie Date: Fri, 4 Mar 2022 16:05:24 -0600 Subject: [PATCH 2/3] Revert "Fix docker build issue" This reverts commit da69bd960642b17588d3a8cbb8494129742d08c5. --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2836a4d..430e07b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ -FROM node:12 +FROM node:12-alpine LABEL maintainer="Texas Tribune " +# add bash for dev +RUN apk add --no-cache bash + RUN mkdir /app WORKDIR /app From 047306bc3f53d9e2ad1b70c74937f1157c7a33a3 Mon Sep 17 00:00:00 2001 From: Daniel Simmons-Ritchie Date: Sat, 5 Mar 2022 12:57:06 -0600 Subject: [PATCH 3/3] Fix: build issue for M1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 430e07b..802bd52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:12-alpine LABEL maintainer="Texas Tribune " # add bash for dev -RUN apk add --no-cache bash +RUN apk add --no-cache bash python2 g++ make RUN mkdir /app WORKDIR /app