diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index 8ca2771c2..500a77818 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -7,8 +7,7 @@ COPY . /code/ RUN npx nx build tup-ui RUN npx nx build tup-cms-react -# TACC/Core-CMS#v4.6.0 (Python 3.11) -FROM taccwma/core-cms:8a56b9d +FROM taccwma/core-cms:v4.8.3 WORKDIR /code diff --git a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html index fdae70211..0c1b6c327 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html +++ b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html @@ -5,13 +5,13 @@ {# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #} +{# https://github.com/TACC/Core-CMS/blob/v4.8.3/taccsite_cms/templates/assets_custom.html #} {% load static %} -{% with settings.FAVICON as favicon %} - +{% with settings.PORTAL_FAVICON as favicon %} + {% endwith %} diff --git a/package-lock.json b/package-lock.json index e69698b34..0e2634ad5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@nx/vite": "17.2.8", "@nx/web": "17.2.8", "@nx/workspace": "17.2.8", - "@tacc/core-styles": "^2.23.1", + "@tacc/core-styles": "^2.25.1", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -5669,9 +5669,9 @@ "dev": true }, "node_modules/@tacc/core-styles": { - "version": "2.23.1", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.23.1.tgz", - "integrity": "sha512-Hu3T1/wfdbuQBZ//DBz2FwxAg+3/x9P1skS6sVldnq7yy3EZZpuOO7Tgu4OZbMlWHJG6IebWQnfniyRTOl9mVA==", + "version": "2.25.1", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.25.1.tgz", + "integrity": "sha512-A4c5sMwKjTe1XLxnc3EWstf1f3L3EgFq5ISGr4e81t8ClPmfXIRqpl+YZMCO4/oo+8ngxV4OMsvzRw7e0mvSpQ==", "dev": true, "bin": { "core-styles": "src/cli.js" diff --git a/package.json b/package.json index 76dbcfa30..b94f65fb9 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@nx/vite": "17.2.8", "@nx/web": "17.2.8", "@nx/workspace": "17.2.8", - "@tacc/core-styles": "^2.23.1", + "@tacc/core-styles": "^2.25.1", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3",