From 493e876a97c6bac0430480da85256bc009bd4e12 Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 10:48:27 +0200 Subject: [PATCH 01/11] syntax fixes are fun --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f7dcf8..9f3b9b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,8 +35,8 @@ ENV UID=1000 \ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER -RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get update && apt-get -y install \ +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - +RUN apt-get update && apt-get -y install \ npm \ python2 \ python3 \ From 0329cd97184d756f34b42598bf6af7d3163e5bfb Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 10:51:20 +0200 Subject: [PATCH 02/11] don't think we need to install curl twice lol --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f3b9b9..dbe5558 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,6 @@ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get -y install \ - npm \ python2 \ python3 \ atomicparsley From 80fcecdaeafc922f6cb03a9753c5479258a8e177 Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 10:57:21 +0200 Subject: [PATCH 03/11] it's a learning experience --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index dbe5558..9f3b9b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,7 @@ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get -y install \ + npm \ python2 \ python3 \ atomicparsley From 3bcbe0d3e7e0f226ea96554e918f0f6c78398e0c Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:04:59 +0200 Subject: [PATCH 04/11] fix dependency node-gyp (>= 3.6.2~) needed --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9f3b9b9..d1c8e99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update && apt-get -y install \ apt-get -y install \ nodejs \ npm && \ + node-gyp && \ npm install -g @angular/cli WORKDIR /build From 7aa5c1bf7f9009bac98fe9a595ab835857e7cc6c Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:21:45 +0200 Subject: [PATCH 05/11] syyyyntax --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1c8e99..5c84989 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && apt-get -y install \ curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get -y install \ nodejs \ - npm && \ + npm \ node-gyp && \ npm install -g @angular/cli From 958f80e20003f92ac36e6347018019ce9d6f20f9 Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:28:34 +0200 Subject: [PATCH 06/11] the good? I learn a lot about Docker building --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c84989..2cab91a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ RUN apt-get update && apt-get -y install \ curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get -y install \ nodejs \ - npm \ - node-gyp && \ + npm && \ + apt-get install -f && \ npm install -g @angular/cli WORKDIR /build @@ -38,7 +38,6 @@ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get -y install \ - npm \ python2 \ python3 \ atomicparsley From 60f2ab449f42733c1210ba996a77bd9725f7cbe5 Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:31:53 +0200 Subject: [PATCH 07/11] yea --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 2cab91a..e84d95c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,7 @@ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get -y install \ + npm\ python2 \ python3 \ atomicparsley From 39ddefab5c0ce5f1c257cceba9a18f34432526d5 Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:37:39 +0200 Subject: [PATCH 08/11] fix dependencies needed for our apt packages --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e84d95c..2f89e6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,8 @@ RUN apt-get update && apt-get -y install \ npm\ python2 \ python3 \ - atomicparsley + atomicparsley && \ + apt-get install -f WORKDIR /app COPY --from=ffmpeg /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg From efaecaa059662c1e4f7a730e0fa63629aeb2366e Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:48:12 +0200 Subject: [PATCH 09/11] use yarn in apt installs instead of npm --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f89e6f..492891e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,9 @@ RUN apt-get update && apt-get -y install \ curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get -y install \ nodejs \ - npm && \ + # YARN: brings along npm, solves dependency conflicts, + # spares us this spaghetti approach: https://stackoverflow.com/a/60547197 + yarn && \ apt-get install -f && \ npm install -g @angular/cli @@ -38,7 +40,9 @@ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get -y install \ - npm\ + # YARN: brings along npm, solves dependency conflicts, + # spares us this spaghetti approach: https://stackoverflow.com/a/60547197 + yarn\ python2 \ python3 \ atomicparsley && \ From 777aebe5082cde8e4d71eff74decc07eb3a938a8 Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:52:35 +0200 Subject: [PATCH 10/11] apparently we still need npm in the last stretch.. --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 492891e..e060a28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,9 +40,7 @@ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get -y install \ - # YARN: brings along npm, solves dependency conflicts, - # spares us this spaghetti approach: https://stackoverflow.com/a/60547197 - yarn\ + npm python2 \ python3 \ atomicparsley && \ From d5ab0d7b9614d154195479f1b4780e38243edfdb Mon Sep 17 00:00:00 2001 From: GlassedSilver Date: Sun, 1 May 2022 11:54:19 +0200 Subject: [PATCH 11/11] I'm getting sleepy, why am I still pushing through --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e060a28..f06e28b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get -y install \ - npm + npm \ python2 \ python3 \ atomicparsley && \