diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index bf0bb5d..ed280bf 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -16,4 +16,4 @@ jobs: with: file: "./compose.yml" service: app - command: "./ci.sh" + command: "bash --login -c -e \"/app/ci.sh\"" diff --git a/Dockerfile b/Dockerfile index 809c981..e4974f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,24 @@ FROM ruby:3.1.6 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql-client software-properties-common -RUN curl -sL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - +SHELL ["/bin/bash", "--login", "-i", "-c"] -RUN add-apt-repository "deb https://deb.nodesource.com/node_14.x $(lsb_release -sc) main" - -RUN apt-get update -qq && apt-get install -y nodejs npm - -RUN npm install -g yarn +RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash RUN mkdir /app +COPY .nvmrc /app/.nvmrc + WORKDIR /app +SHELL ["/bin/bash", "--login", "-c"] + +RUN nvm install + +SHELL ["/bin/bash", "--login", "-c"] + +RUN npm install -g yarn + COPY .ruby-version /app/.ruby-version COPY Gemfile /app/Gemfile COPY Gemfile.lock /app/Gemfile.lock diff --git a/package.json b/package.json index 3a4dc8f..3a5a8b6 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,6 @@ "webpack-dev-server": "^3.11.2" }, "engines": { - "node": "18.19.0" + "node": "14.21.3" } }