Skip to content

Commit

Permalink
- CHG: Updated Dockerfile to move to node 22, Java 21.
Browse files Browse the repository at this point in the history
- FIX: npm audit fix.
  • Loading branch information
sebastian-raubach committed Nov 4, 2024
1 parent 15b9bb0 commit 4b0fab0
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 38 deletions.
12 changes: 6 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.0-alpine3.17 AS builder
FROM node:22.11-alpine3.20 AS builder

LABEL maintainer="sebastian.raubach@hutton.ac.uk"

Expand All @@ -23,15 +23,15 @@ RUN rm -f .env && \
cp -a /opt/germinate-client/dist/. /opt/germinate-server/client/

# Download Gradle and build the server code
RUN apk add --no-cache openjdk11 && \
wget https://services.gradle.org/distributions/gradle-6.0.1-bin.zip -P /tmp/ && \
unzip /tmp/gradle-6.0.1-bin.zip -d /opt/ && \
RUN apk add --no-cache openjdk21 && \
wget https://services.gradle.org/distributions/gradle-8.8-bin.zip -P /tmp/ && \
unzip /tmp/gradle-8.8-bin.zip -d /opt/ && \
echo "data.directory.external=/data/germinate" > /opt/germinate-server/config.properties && \
echo "project.name=germinate" >> /opt/germinate-server/gradle.properties && \
/opt/gradle-6.0.1/bin/gradle -p /opt/germinate-server war
/opt/gradle-8.8/bin/gradle -p /opt/germinate-server war


FROM tomcat:10.1-jdk11
FROM tomcat:10.1-jdk21

LABEL maintainer="sebastian.raubach@hutton.ac.uk"

Expand Down
69 changes: 37 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
const { defineConfig } = require('@vue/cli-service')

module.exports = defineConfig({
devServer: {
port: 4000
},
transpileDependencies: false,
publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
configureWebpack: {
Expand Down

0 comments on commit 4b0fab0

Please sign in to comment.