From d6857e061763636a0cd32e6bf760a9add7fe3144 Mon Sep 17 00:00:00 2001 From: Jack Ellis Date: Mon, 22 Jan 2024 23:00:17 +0000 Subject: [PATCH] what the FUCK are these system requirements --- _docker/app.dockerfile | 17 +++++++++++++---- _docker/node.dockerfile | 7 ------- package.json | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 _docker/node.dockerfile diff --git a/_docker/app.dockerfile b/_docker/app.dockerfile index 68dc6b11e8d..88fa9076d3c 100644 --- a/_docker/app.dockerfile +++ b/_docker/app.dockerfile @@ -1,4 +1,5 @@ -ARG RUBY_VERSION=2.4.0 +ARG RUBY_VERSION=2.4.10 +ARG NODE_VERSION=10.16.0 FROM ruby:${RUBY_VERSION} @@ -6,9 +7,17 @@ WORKDIR /app COPY . . -RUN bundle install +RUN gem install bundler -v 2.3.27 \ + && bundle install RUN apt-get -y update \ - && apt-get upgrade \ - && apt-get install -y n \ + && apt-get -y upgrade + +# I hate this. + +RUN apt-get -y install npm + +RUN npm cache clean -f + +RUN npm install -g n \ && n 10.16.0 \ No newline at end of file diff --git a/_docker/node.dockerfile b/_docker/node.dockerfile deleted file mode 100644 index 5e083fbd426..00000000000 --- a/_docker/node.dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG NODE_VERSION=10.18.0 - -FROM node:${NODE_VERSION} - -WORKDIR /app - -COPY . . diff --git a/package.json b/package.json index b3b33535dbe..f204bac2b7d 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "url": "https://github.com/newtheatre/history-project/issues" }, "scripts": { - "bower:install": "bower install", + "bower:install": "bower install --allow-root", "gulp:deploy": "gulp build_deploy", "gulp:build": "gulp build" }