From 3982edef8038835050cda79c800d005cef07b1b9 Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Wed, 11 Dec 2024 02:10:59 -0500 Subject: [PATCH 1/2] Docker 3 (#12) * update Docker file, add start.sh * fix basePath * fix path --- Dockerfile | 2 +- next.config.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 753f7ab..0903dd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM quay.io/cdis/ubuntu:20.04 AS build ARG NODE_VERSION=20 -ARG NEXT_PUBLIC_PORTAL_BASENAME=/ff +ARG NEXT_PUBLIC_PORTAL_BASENAME ENV NPM_CONFIG_PREFIX=/home/node/.npm-global ENV PATH=$PATH:/home/node/.npm-global/bin diff --git a/next.config.js b/next.config.js index f1de490..249b0ee 100644 --- a/next.config.js +++ b/next.config.js @@ -22,7 +22,6 @@ const nextConfig = { output: 'standalone', reactStrictMode: true, pageExtensions: ['mdx', 'md', 'jsx', 'js', 'tsx', 'ts'], - basePath: process.env.NEXT_PUBLIC_PORTAL_BASENAME || '', transpilePackages: ['@gen3/core', '@gen3/frontend'], webpack: (config) => { config.infrastructureLogging = { From 2990a212d2d94b9670be4ad69afc875e4f01a92d Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Tue, 17 Dec 2024 15:32:03 -0500 Subject: [PATCH 2/2] Update ci.yaml (#13) --- .github/workflows/ci.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 77d0dc9..cbfff44 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,13 +4,14 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v3 - with: - node-version: 20 - - name: Setup npm - run: npm install -g npm@10.2.4 - - name: Install modules - run: npm ci - - name: Run ESLint - run: npm run lint + - uses: actions/checkout@v2 + - uses: actions/setup-node@v4.1.0 + with: + node-version: 20.17.0 + - name: Get Version + run: npm -v + - name: Install modules + + run: npm ci + - name: Run ESLint + run: npm run lint